Merge pull request #1 from mboeckle/master

added home page bootstrap
fixed merge conflicts for css changes