Fix conflict
Merge branch 'master' of
https://github.com/GRM-Group/BattleOfLegends-Launcher.git

Conflicts:
	.classpath