modal working
modal style fixes
resolve merge conlficts
Merge pull request #12 from arwong09/create_show_modal

Create show modal