- Update User model
- Create login, logout routes
- Update dependencies
Merge remote-tracking branch 'upstream/master'

Conflicts:
	backend/app.js
- Update app.js: routes, passport and merge conflicts
Merge remote-tracking branch 'upstream/master'

Conflicts:
	backend/app.js
- rearranging the project
- updated project
Merge remote-tracking branch 'upstream/master'
- updated merge
- updated merge
- merge#25
- bootstrap integration
Merge branch 'upstream'
Merge remote-tracking branch 'upstream/master'
- passport integration
- routes creation for passport
- alter index page
- bootstrap integration continued
- passport integration
- routes creation for passport
- alter index page
- bootstrap integration continued
Merge pull request #27 from cmarinos/master

passport integration - main page creation