For heroku
Clean up and style
Merge branch 'master' of https://github.com/jaysenparmar/Boilerplate

Conflicts:
	views/fblogin.handlebars
	views/index.handlebars
	views/match.handlebars