Modified gitignore to support intellij idea
Merge branch 'ailjushkin'

Conflicts:
	.gitignore