joe
joe
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1

Conflicts:
	Test.txt
	Test.txt.BASE.txt
	Test.txt.LOCAL.txt
	Test.txt.REMOTE.txt