first commit
Merge branch 'master' of https://github.com/Aithelle/tp_2014_02_java_lukyanova