added idea project files to gitignore
Merge branch 'master' into javascript-remake

Conflicts:
	.gitignore