heroku config
readme
Merge branch 'master' of https://github.com/defis/myblog

Conflicts:
	config/database.yml