remove .idea folder
Merge branch 'master' of https://github.com/seekerlee/Ultimate24

Conflicts:
	.idea/workspace.xml