Game Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/javachallenge/util/Map.java
Handling is done.
Merge remote-tracking branch 'origin/master'