removed .idea from repo
added .gitignore
Merge branch 'master' of https://github.com/jpablo/superficie

Conflicts:
	.gitignore