Making progress
Merge branch 'master' of github.com:DavePearce/TeachingAlloc

Conflicts:
	data/2013/allocation.dat
Minor weaks