d1 start
我的书签
Merge branch 'master' of git://github.com/menxu/edushare_mobile_app_demo

Conflicts:
	config/routes.rb