changed database.yml to support postgresql
Merge branch 'master' of github.com:haotianwang/CanvUs