postgres setup
Merge branch 'luke' of github.com:JessicaG/slice_works_clone into luke
heroku database testing
heroku db testing
Merge branch 'master' into luke

Conflicts:
	lib/app.rb
Merge branch 'luke'