Bootstrap 3
Merge pull request #24 from jdfreder/bootstrap3

Bootstrap 3