Added Intellij Idea files to gitignore
Merge branch 'master' of https://github.com/mkuokkanen/groundwork

Conflicts:
	.gitignore