Merge branch 'master' of https://github.com/hectorarroyo/prubasgh.git

Conflicts:
	pruebasgithubsync/newfile.php

Change-Id: I861dd23a82991076b6b80b1162c73f61a4293a9e
Signed-off-by: hectorarroyo <hector.arroyo@arteika.com>
Commir
dsdsda
Merge branch 'master' of https://github.com/hectorarroyo/prubasgh.git


Signed-off-by: hectorarroyo <hector.arroyo@arteika.com>