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

Conflicts:
	pruebasgithubsync/newfile.php
dasdsad
Merge branch 'master' of https://github.com/hectorarroyo/prubasgh.git