Merge pull request #355 from jnovack/bootstrap3

Bootstrap v3.1.0 / Font-Awesome v4.0.3 - Initial Commit