ignoring cloudbees secrets and IntelliJ files
Merge branch 'master' of https://github.com/kastork/asymmetric-warfare

Conflicts:
	.gitignore