addde user, db connector
added user, db connector
ignored swapped file
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/atdaemon/hack_uber