minor change to model, added senior lecturer
Merge branch 'master' of https://github.com/rrd09/project

Conflicts:
	src/Test.java