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

Conflicts:
	.classpath
	.gitignore
	.travis.yml