travis
Merge branch 'master' of https://github.com/julianjjo/Kata-Juego-Cuadrito

Conflicts:
	features/cuadricula.feature