Quick commit to prevent a code clash
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hoop.jar
	src/edu/cmu/cs/in/controls/wizard/HoopWizardBase.java