Teste merge.
Merge branch 'master' of github.com:jpedrorl/mc504

Conflicts:
	planning.txt