Merge branch 'release/1.5.4' into develop
Merge branch 'hotfix/contact-logo' into develop
Merge branch 'hotfix/logo-url' into develop
update to use bootstrap 3.0.0
remove unused layouts
new committee layout
set button style
new nav bar
change active class code
fix contact page
fix btn class
make sure you comment out all the things
fix email
Merge branch 'hotfix/docs' into develop
aaaand nope
Revert "aaaand nope"

This reverts commit 029d55f9e52e471c1d3f8f27460cca15aa856480.
Merge branch 'hotfix/undo-docs' into develop
test sticky footer
Revert "test sticky footer"

This reverts commit 549b49b9eefbcf348b28c1324c0f8af4833086d5.
change margin on jumbotron & add glyphicon support