tune
Merge branch 'master' of https://github.com/darkfeline/scheduling1

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
tune
Merge branch 'master' of https://github.com/darkfeline/scheduling1

Conflicts:
	data/classes.xls
	src/Main.java
	src/MakeClass.java
	src/TabuSolver.java
adjust empty seats costs
Merge branch 'master' of https://github.com/darkfeline/scheduling1

Conflicts:
	src/SimpleCost.java
	src/TabuSolver.java