Merge branch 'master' of https://github.com/jerry134/web6ey

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'master' of https://github.com/jerry134/web6ey

Conflicts:
	config/routes.rb
	db/schema.rb
Merge branch 'master' of https://github.com/jerry134/web6ey
Merge pull request #60 from caok/master

合并冲突