add migration changes
show.html.erb
Merge branch 'master' of https://github.com/salamanders-2014/share-dbc

merging