changed some colors
Merge branch 'master' of https://github.com/brandybear/GameOfLife

Conflicts:
	src/coffeecode.coffee