test3
Merge branch 'master' of https://github.com/nguyentuan132/diablo2.git

Conflicts:
	diablo/src/main/java/com/tuan/diablo/App.java