teste do capeta2: criei o igual.txt no ft1
Merge branch 'master' of http://github.com/brunosesso/FirstTry

Conflicts:
	igual.txt