Made the project an Intellij one as well
Ignored the workspace.xml
Merge pull request #5 from caiusb/intellij

Made the project IntelliJ aware
Merge branch 'refs/heads/master-org' into listeners

Conflicts:
	.gitignore