Merge pull request #1 from Siesna/feature/adding-bootstrap

Merging in bootstrap addition
Merge pull request #2 from Siesna/develop

Merge pull request #1 from Siesna/feature/adding-bootstrap