Just for JZHU
FrontPage
change settings to html
Merge some front page stuff
Merge branch 'master' of github.com:hellovai/mealmaniac
Merge branch 'jzhu'

Conflicts:
	client/views/header.ejs
	client/views/settings.ejs