basic gameplay is allllllll done
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascripts/levels/scene1.js
	public/javascripts/levels/scene3.js
	public/javascripts/levels/scene4.js
	public/javascripts/levels/scene5.js
	public/javascripts/levels/scene6.js
	public/javascripts/levels/scene7.js
	public/javascripts/story.js