Reverted to include Mohammad's Changes

Conflicts:
	src/MainDisplay.java