preparing for merge
Merge branch 'master' of https://github.com/BrodrickChilds/prisoner

Conflicts:
	app/views/stages/index.html.haml
	app/views/stages/show.html.haml
Merge branch 'master' of https://github.com/BrodrickChilds/prisoner

Conflicts:
	app/views/stages/show.html.haml
o.o