imagen de perfil
Merge branch 'master' of https://github.com/MiliGaricoits/WIR

Conflicts:
	js/mainScreen.js