Simple town scene for testing

Player:
* added gun
* fixed movement bug

HUD:
* added crosshair
Simple town scene for testing

Player:
* added gun
* fixed movement bug

HUD:
* added crosshair
Some changes...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mygame/Main.java
	src/mygame/Map.java