error hunting
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2013-questions

Conflicts:
	src/main/java/uk/ac/cam/sup/controllers/GeneralController.java