Bootstrap colors
Merge branch 'master' of https://github.com/pmnguye3/JAMSGitHub.git