Random class files

Can't get an up-to-date version until I do this
Merge branch 'master' of https://github.com/GoesOnGhost/DataStructAlgorithmsConfProject2014

Conflicts:
	MainWindow.class