Added subprograms and some other stuff
Merge branch 'master' of github.com:hwh33/PrisonerExpress

Conflicts:
	PrisonerExpress/models.py
	PrisonerExpress/templates/prisoner_detail.html
	PrisonerExpress/user_views.py
Changed up gitignore to stop dealing with the mergetool artifacts
Organized some stuff, made some aesthetic changes