Merge DGBranch
Fix typos
Merge branch 'master' of github.com:darkfeline/scheduling1

Conflicts:
	src/ClassGraph.java
	src/ClassNode.java
	src/ClassRoom.java
	src/FreeList.java
	src/Main.java
	src/MakeClass.java
	src/Room.java
	src/SimpleMakeClass.java
	src/SimpleSimAnnealing.java
	src/TabuSolver.java
	src/solugen.java