fixed particle lifetime
Merge branch 'master' of https://github.com/amurat/ggj2014

Conflicts:
	src/constants.js
	src/game.js