text thing
Merge branch 'master' of https://github.com/Academia2013Cohort1/Equipe2

Conflicts:
	test.txt