Try to ignore .idea folder.
Merge remote-tracking branch 'origin/master'
Removed idea meuk.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Just a check to see if my git authentication works..