some stuff
Merge branch 'master' of https://github.com/jeshuamaxey/VAMjam

Conflicts:
	public/views/play.html