some change in deployment env
to resolve conflict
Merge branch 'master' of github.com:donneshaw/sample_app
Merge branch 'master' of github.com:donneshaw/sample_app
deployment env
switch development and test env from sqlite3 to postgresql
Add user microposts