Lots of work on the fireworks
Merge branch 'master' of https://github.com/sebleedelisle/PixelPyros

Conflicts:
	PixelPyros/bin/PixelPyrosDebug.app/Contents/MacOS/PixelPyrosDebug