Trying to configure .gitignore
Merge branch 'master' of https://github.com/shalvin/IronBark-Development
Trying to configure .gitignore. These project files in .idea/ (like workspace.xml) are breaking what should be simple merges.
Conflicts:
	.idea/workspace.xml