modifi
Merge branch 'master' of git@github.com:serdel/heracles.git

Conflicts:
	Heracles/.classpath