Window follows Mario now
Merge remote-tracking branch 'origin/master'
Good I hope?
Merge branch 'master' of https://github.com/juesato/mario3sat.git

Conflicts:
	HackMit/bin/GameFrame.class
	HackMit/src/GameFrame.java