Rearrange bootstrap js and css, include in index.
Merge branch 'master' of https://github.com/ColoradoSchoolOfMines/acmx_website
change again