edited database.yml for psql
Merge branch 'master' of github.com:TobyRet/instagram_clone into development
merge commit