updated to pg, user scaffold created
Merge branch 'master' of https://github.com/mseger/kpop