slight modification for editing
Merge branch 'master' of github.com:hwh33/PrisonerExpress
Merge branch 'master' of github.com:hwh33/PrisonerExpress
Got search bar working
Ahhhhhh
Fixed some stuff
Merge branch 'master' of github.com:hwh33/PrisonerExpress

Conflicts:
	PrisonerExpress/static/app.css
	PrisonerExpress/templates/new_letter.html
Merge branch 'master' of github.com:hwh33/PrisonerExpress

Conflicts:
	PrisonerExpress/templates/program_detail.html
	PrisonerExpress/urls.py