Color collision in
Merge branch 'master' of https://github.com/wjys/Blockr

Conflicts:
	Blockr/bin/.gitignore
	Blockr/bin/blockr/Blockr.class
	Blockr/src/blockr/Blockr.java