initial commit
gitignore idea files
up to 8
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
up to 8