?
a
a
Merge branch 'master' of https://github.com/brandonadalesandro/AndroidGame

Conflicts:
	bin/classes/org/awesome/AndroidGame/MainGamePanel.class
	bin/classes/org/awesome/Models/Map.class
	bin/classes/org/awesome/Models/Player.class
	src/org/awesome/AndroidGame/MainGamePanel.java
	src/org/awesome/Models/Player.java
moved player update to player update method