version controller spec
resolve merge conflict
add version on show page
Merge pull request #10 from petebrooks/version-show

Version show