fabien
Merge branch 'master' of
ssh://git@github.com/jeromehubner/ProjetAIFCC2014-test.git

Conflicts:
	ProjetAIFCC2014/src/com/example/projetaifcc2014/ClassTest.java
Merge branch 'master' of ssh://git@github.com/jeromehubner/ProjetAIFCC2014-test.git