Adding font
Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
adding prompt
making this thing work
commiting stuff
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into MikeSkiles

Conflicts:
	public/src/main.js
adding prompt system
Merge pull request #6 from archcomet/MichaelSkiles

Michael skiles
added collision sound
fixed bug in sound system around sound sources.
added stopSound before startSound when a player hits an enemy