first commit
add comment function
merge with the online version
Merge https://github.com/Zongji/rails_blog_demo

Conflicts:
	.gitignore