Merge remote-tracking branch 'origin/master'
# Conflicts:
# static/home/About-us.png
# static/home/Event.png
# static/home/FAQ.png
# static/home/TC.png
# static/home/menu.png
# static/home/menu1.png
# static/home/menu2.png
# static/home/menu3.png
# static/home/menu4.png
# static/login/language.png
|