All unit classes are done.
Merge remote-tracking branch 'origin/master'
All unit classes are done.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/javachallenge/server/Game.java
Merge remote-tracking branch 'origin/master'