Bug On Portrayal Fixed
Merge branch 'master' of git@github.com:trecouvr/ia04.git

Conflicts:
	ia4_project/.classpath