Problems with heroku, trying different database on production
Fixing setup using postgresql database
Merge branch 'master' of github.com:retallicka/portfolio

Conflicts:
	Gemfile
Adding gemfile.LOCK
Trying to fix issue where heroku isn't showing compiled css