conflito
Merge branch 'master' of https://github.com/Arc2014/trabalhoQS

Conflicts:
	renato.txt