changing felipe.txt
Merge pull request #3 from leandromaia/FK_tests

accepting changing felipe.txt....
Merge branch 'story_tests' of https://github.com/leandromaia/playground into story_tests
deleting leandro file
Merge branches 'master' and 'story_tests'
Merge branches 'test_tiago' and 'story_tests' into test_tiago
deleting felipe file
Merge branch 'test_tiago'