Adding zoom functionality and map styles
Merge branch 'master' of https://github.com/andrewcarreiro/hackathought
Adding remaining locations, removing JSON file, dont need it
Merge branch 'master' of https://github.com/andrewcarreiro/hackathought

Conflicts:
	views/home.ejs
	views/layout.ejs