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

Conflicts:
	.gitignore