remove .idea directory
Merge branch 'development' of github.com:ckolek/musicID into development

Conflicts:
	.idea/modules.xml