rubymine config git ignore
Merge branch 'master' of https://github.com/OlegPasko/rorgh

Conflicts:
	.gitignore