javascript changes
Merge branch 'master' of https://github.com/TuftsHack2013/PhantomEchoes

Conflicts:
	Assets/js/game.js
javascript changes