Updated database & worked on show.erb
Merge branch 'feature/show_page' into develop