Adding spree and hubflow
Installing bootstrap extension
Merge branch 'master' into feature/adding-bootstrap

Conflicts:
	.gitignore
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
Merge pull request #3 from Siesna/feature/adding-bootstrap

Creating master