Initial commit
Merge branch 'master' of https://github.com/robinverduijn/p4idea

Conflicts:
	.gitignore