fixed merge typo problems
added pg gem to development
created user scaffolding