bram jarvar check
bram jarvar check2
Merge branch 'master' of https://github.com/iTzzGhutix/LeGame.git

Conflicts:
	LeGame/src/main/StringPanel.java