Merge branch 'master' of https://github.com/Keruspe/Morpion
rework a bunch of stuff

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Merge branch 'master' of git://github.com/rbelouin/Morpion

* 'master' of git://github.com/rbelouin/Morpion: