Slight changes to model and formatting
Added header file too
Added stuff for creating prisoners
Merge branch 'ross-branch'

Conflicts:
	db.sqlite3