Merge branch 'master' of https://github.com/JavierGonzalezAlfaro/kata2.git