clean .idea folder
Merge branch 'master' of https://github.com/neosergio/proyecto-adamantium

Conflicts:
	.idea/workspace.xml