.
Merge branch 'ronaldo' of https://github.com/jmzc/test.git into ronaldo

Conflicts:
	script1.sh