partial commit.
Merge branch 'master' of git@github.com:rodrigoscalco/workflowGit.git

Conflicts:
	File01.php