update
Merge branch 'master' of https://github.com/rongyiwang/term_with_wechat

Conflicts:
	app/views/welcome/show_demo.html.erb