Player bitmap
Player bitmAp
Player image
player image
Merge branch 'master' of https://github.com/DigohD/SE-Android

Conflicts:
	src/com/example/se_android/GameView.java
	src/com/example/se_android/Player.java