Return back database.yml because of heroku.
Removed back database.yml because of heroku.
Return back http.
Merge branch 'master' of heroku.com:skoder-stringer-rss
Rollback my changes.
Changed font.
Merge branch 'master' of heroku.com:skoder-stringer-rss

Conflicts:
	app/public/css/flat-ui-no-icons.css
Merge branch 'master' into add-feeds-categories
By some reason Heroku won't deploy with ap in development group.