Adding more color
Merge branch 'master' of github.com:JosephYao/java-tdd-training-exercises

Conflicts:
	2048/src/com/game2048/Game2048.java