8789y8oto9
Merge branch 'master' of https://github.com/vinhthien0301/07-androidgame-kingdomdefender

Conflicts:
	KingdomDefender/src/com/techstorm/androidgame/kingdomdefender/MainActivity.java