Merge branch 'master' of github.com:caridy/feecbr-app
Merge branch 'master' of github.com:caridy/feecbr-app
Added gitignore
Fix of conflicts
Changes to pass in jshint
Merge with caridy/master; Changes into app.js to pass in jshint
Changes to pass into jshint test
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
Add Workshop photo
Merge pull request #21 from patrickrbc/master

Add Workshop photo
Removed the changes to pass into jshint
Merge pull request #19 from sergiovilar/master

jshint to pass!