finish login
Merge branch 'master' of https://github.com/eladdo92/tripbook

Conflicts:
	.idea/workspace.xml
	views/layout.jade