Merge pull request #2 from strobelm/bootstrap3

Bootstrap3