added modal
solved merge conflicts
Merge pull request #6 from jpk1215/frontend-os

added modal