Merge branch 'master' of https://github.com/barbanero/Juguete

Conflicts:
	Juguete/build.gradle
Merge pull request #6 from barbanero/master

Merge branch 'master' of https://github.com/barbanero/Juguete