editing show page
edit index
First new addition
Merge branch 'david' of https://github.com/ScottLNorvell/break_this_app
Merge branch 'francesca' of https://github.com/ScottLNorvell/break_this_app