Some changes
Added assets
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameDemo/src/com/angrynerds/gameobjects/Map.java
	GameDemo/src/com/angrynerds/gameobjects/Player.java