First test
Merge branch 'master' of https://github.com/Applemoon/tp_2014_09_java_joust