ERROR: en updater (intentando corregir)
Merge branch 'master' of https://github.com/pixLoop/version1

Conflicts:
	updater/index.php