tried to do stuff in main.js
Merge branch 'master' of github.com:theCodeBear/ToyotaHackathon

Conflicts:
	public/javascripts/main.js