Added bootstrap, basic navbar
minor changes in controller
Merge branch 'master' of github.com:jdeslangles/project3