prueba
Merge branch 'master' of https://github.com/clickerzone/clicker

Conflicts:
	img/content/edison.png
	img/content/guille.png
	img/content/josue.png
	img/content/luis.png