rm comment out codes
Merge remote-tracking branch 'upsteam/master'

Conflicts:
	app/controllers/users_controller.rb
Merge pull request #96 from mouse-lin/master

users index all users