Add color/style option for particles
Merge branch 'master' of https://github.com/zachanima/catbox

Conflicts:
	shmup/Enemy.js
Merge branch 'master' of https://github.com/zachanima/catbox