color bomb
Merge branch 'master' into color
Revert "take that"

Conflicts:
	index.php
original color
Merge branch 'color'