New default index.html

Changed index.html. added locations.html for map placement
Merge branch 'master' of https://github.com/vciancio/Poptart

Conflicts:
	home.html