test intellij
Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore
Merge pull request #1 from 0Chuzz/master

test pull request