New colors
Merge branch 'master' of https://github.com/lukefiorante/painteypete

Conflicts:
	src/mllf/painter/PaintBall.java
	src/mllf/painter/StickyBomb.java