修改:         2014-10-24-rails1.md
Merge branch 'master' of https://github.com/simontaosim/simontaosim.github.io

Conflicts:
	_posts/2014-10-24-rails1.md
	.git/MERGE_HEAD