changing db to pg
images added to show
Merge branch 'develop'
css changes