COMMIT OF THE VICTORY ON CONFLICT !
Merge branch 'master' of https://github.com/esiringame/LD2014