MainWindow.clss
Merge branch 'master' of https://github.com/GoesOnGhost/DataStructAlgorithmsConfProject2014

Conflicts:
	MainWindow.class