begins bootstrap
Merge branch 'master' of github.com:ldemarest/modernm
nav bar and slider
might fix merge conflicts