Colors are fun!
Although not fun enough yet. MORE COLOURS. MOOOARR.
Merge branch 'master' of
https://qmpzaltb@github.com/qmpzaltb/cptgame.git

Sigh.
Conflicts:
	Dung/src/dungContent/ColorList.java