Clean styling, add bootstrappy navbar
Add sample sidebar content; sidebar not yet responding to navbar
fixed merge conflicts