editied gitignore
Removed the .idea folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore