Ignore IDE project file
Merge branch 'master' of https://github.com/UnionDesign/boscobel

Conflicts:
	.gitignore