building main page
Merge branch 'master' of https://github.com/maxshen1996/FinalProject

Conflicts:
	Ask-Harvard/client/templates/mainpage.html
Merge branch 'master' of https://github.com/maxshen1996/FinalProject