Merge branch 'master' of https://github.com/ayushbhagat/battlehacktoronto

Conflicts:
	views/about.ejs