this is my twitter
fixing the mess
Merge branch 'master' of https://github.com/caridy/feecbr-app
add my name
Merge branch 'master' of https://github.com/caridy/feecbr-app
Merge pull request #14 from gugavillar/master

add my name
adding photos to the photos page with fake data
Merge branch 'master' of github.com:caridy/feecbr-app after some weird stuff happened.
Resolução de conflitos