1
Merge branch 'xiaoyu'

Conflicts:
	config/routes.rb
	db/schema.rb
Merge pull request #4 from satzcoal/master

hello1014