Muiferie
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2013-handins

Conflicts:
	src/main/java/uk/ac/cam/sup/models/Bin.java