the starting colours are wrong, but changes to the colours no longer revert back to default.
Merge branch 'master' of https://github.com/Imperiouspi/Complex-Life

Conflicts:
	src/gui/aWindow.java