Edit .gitignore to include IntelliJ IDEA files to ignore
Merge branch 'FirstSetup'

Conflicts:
	.gitignore