modified nav bar
Merge branch 'develop' into staging
re-added bootstrap, modified the carousel
re-added bootstrap, modified the carousel
Merge branch 'develop' into staging