Merge pull request #21 from margaretgodowns/master

Y'all might want to make sure this doesn't break anything...
working on show page
Merge pull request #22 from crotten/master

working on show page
inor route changes
added some css
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
Merge pull request #23 from crotten/master

added some css
ore playing around with javascripts and an edit to some wordage
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team4
added more styling