Better sidebar
Merge branch 'master' of github.com:cs4352/class_project into safe