HUD main game ditambah
test
merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes.dex
	bin/dexedLibs/andengine-746df2272b74191f2b60d86742b611ce.jar
	bin/dexedLibs/andenginetmxtiledmapextension-8d612e4c8a9bb1baabe938fd514da60f.jar
	bin/dexedLibs/android-support-v4-13e15b152ec3114ae60a1f71a377685c.jar
	bin/dexedLibs/annotations-a52b7fbe9a2ab9c6153e95d0e89068af.jar
	bin/resources.ap_
	src/nubiceria/schoollife/scenes/MainGameScene.java
merging