update master for stagin and master
redesign of show page
Merge pull request #28 from jonathanpeterwu/styling-staging-branch

Styling staging branch