samuel
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe4

Conflicts:
	Test.txt