sites/show update
Merge pull request #58 from maiahariton/master

sites/show update
fixing merge conflicts in sites index html