Start work on particles.
Merge branch 'master' of github.com:akbiggs/incredible_journey

Conflicts:
	index.html
	src/coffee/game_object.coffee
	src/js/game_object.js
Merge branch 'master' of github.com:akbiggs/incredible_journey