merging...
Merge branch 'master' of github.com:e2themillions/swaggatar
added login with passport + angularjs