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
add info
Merge branch 'master' of github.com:caridy/feecbr-app
info add
Merge branch 'master' of github.com:caridy/feecbr-app
* ignoring node_modules
* package.json to install express and set up the application
* app serving on 3000 plus a simple hello world route
Added gitignore
Fix of conflicts
adding express handlebars engine to the app with a layout definition
Changes to pass in jshint
Merge pull request #16 from hildosantos/master

hildo file
Merge pull request #14 from gugavillar/master

add my name
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.