First Commit
add .idea in ignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Remove the now ignored directory ".idea"