commit 4
Merge branch 'master' of https://github.com/jdesousa/myRepos

Conflicts:
	test