Try number 2 to remove the IDE files.
Merge branch 'master' of https://github.com/BChauv/PlayerMagnet

Conflicts:
	.idea/misc.xml
	.idea/vcs.xml
	.idea/workspace.xml