Removed .idea form git
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/els.iml
	.idea/misc.xml