Did some stuff
Merge remote-tracking branch 'origin/master'

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