version
修改title
Merge branch 'master' of https://github.com/gangzz/blog

Conflicts:
	config/database.yml