Updated main.js
Merge branch 'master' of github.com:vmathur/mhacks3

Conflicts:
	.DS_Store
	public/index.html
	public/js/main.js