template changes
static folder and half of gmap
Merge branch 'master' of https://github.com/axsauze/HackaGlobal

Conflicts:
	website/static/img/vi.png
	website/static/js/script.js