deleted:    config/database.example .yml
	deleted:    "config/database.example.yml\ndatabase.example.yml"
	modified:   config/database.example.yml
Merge branch 'master' of https://github.com/kasabian/blog