first commit
combined sidebar and content
WIP modal page
Merge pull request #2 from JasonBenn/frontend

Frontend