added postgres addon
Merge branch 'development'
added gemfile.lock
added postgres setup
Merge branch 'development'
edited setup
edited setup
testing something out
changed setup