細々修正
Merge branch 'master' of github.com:kuntao/taskeyOnRails

Conflicts:
	app/views/users/followed.html.erb
	app/views/users/following.html.erb
	app/views/users/loveit.html.erb