remove .idea
Merge branch 'master' of github.com:Tonyhark/JD-accessory

Conflicts:
	.idea/workspace.xml