Verifying changes actually occur
Updated to read from index.html
Updated to read from index.html
Merge branch 'master' of heroku.com:pure-journey-6927

Conflicts:
	web.js
Updated to show basic layout