Installing bootstrap extension
Adding gitignore
Merge branch 'master' into feature/adding-bootstrap

Conflicts:
	.gitignore
Merge pull request #1 from Siesna/feature/adding-bootstrap

Merging in bootstrap addition