added rspec tests
stuffff
meh
Merge pull request #36 from tbuchanan/master

fixes to show page, but still needs a lot of work
pulled group master