Cleaned up issues with Wednesday demo
Merge branch 'master' of github.com:Taormina/OnlineTrail

Conflicts:
	prototype.html
Merge branch 'master' of github.com:Taormina/OnlineTrail