stuff
Merge branch 'restart' of github.com:khuynh1/passwordsync into restart
changing conf.example and adding db.yml