modified:   my_app.rb
Merge branch 'master' of https://github.com/siumiao/myblog
	modified:   README