Adding font
Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Added sound system and some initial assets
stuff
adding prompt
making this thing work
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into gpg

Conflicts:
public/src/main.js

-- added playqueue and initial sound event
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into gpg

Conflicts:
public/src/main.js

-- added playqueue and initial sound event
Merge pull request #3 from archcomet/gpg

Gpg
Merge pull request #5 from archcomet/archcomet

Implemented basic predator behavior
commiting stuff
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into gpg

Conflicts:
public/src/main.js

-- added playqueue and initial sound event
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