Merge branch 'master' of https://github.com/donfranciscojavier/HorseQueen.git