modified show page and editor
fixed merge conflict
modified show page and editor
Merge branch 'dont_bro_me_before_you_show_me' of https://github.com/dhouk24/strobehub into dont_bro_me_before_you_show_me
Merge pull request #64 from dhouk24/dont_bro_me_before_you_show_me

modified show page and editor