Added half of the models
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2013-handins

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