little changes
Merge branch 'master' of git@github.com:sgm1/RushHour.git

Conflicts:
	RushHour/src/launcher/MainFrame.java

Restored the caraters, lost for some reason