Added Menu and Location Display
Merge branch 'master' of https://github.com/bryant-pham/CULTUREHUNT2

Conflicts:
	assets/js/map.js
	index.html