working on it
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into more_descriptive_branch_name
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into more_descriptive_branch_name
fixed show.html.erb error
Merge pull request #31 from nealcpeters/fixed_broken_show_view

Fixed broken show view