basic logic of program
change base.html position
Merge branch 'ross-branch'

Conflicts:
	db.sqlite3
Made a lot of progress with programs, prisoners, list views, etc