heroku
not heroku
Merge branch 'master' of github.com:BrodrickChilds/prisoner
fixed a couple display things/bugs
heroku