IS changes
Merge remote branch 'remote/master'
minor is changes
IS Changes
IS Changes
Merge remote branch 'remote/master'

Conflicts:
	src/gui/CenterPanel.java