teasting sorting
Merge branch 'master' of github.com:sparbz/stats

Conflicts:
	app/controllers/players_controller.rb
	app/views/players/index.html.erb
sorting