First bootstarp edit
Merge branch 'master' of https://github.com/brendanwr/2014FallWeb