Merge pull request #16 from cdog/master

Upgraded from Bootstrap v2.x to v3.x