holly
holly hibernate stuff
Merge branch 'master' of https://github.com/madgen/TimetableToy

Conflicts:
	src/main/java/TimetableToy.java
	target/classes/TimetableToy.class