Add collision detection between the players and tiles
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/src/client/main/CodenameNovak.java
	src/novak/gameobjects/Player.java
Revise Player class so it stores the hit box