GUI setup, ZoomIn ZoomOut Second Trail
Merge branch 'master' of http://github.com/ylwu/HackMIT

Conflicts:
	src/GUI/JPanelDemo.java