Ignoring classpath
Merge branch 'master' of https://github.com/fran-jo/edu.smartslab.cim2model

Conflicts:
	.gitignore