Some minor change in "Thought after JMP Scripting Language training"
upgrade gems
Merge remote-tracking branch 'origin/eric_blog' into eric_blog

Conflicts:
	Gemfile.lock
Merge branch 'eric_blog' of github.com:Eric-Guo/octopress into eric_blog
upgrade gems