Updates to website
Modified Bootstrap.css
Merged files