search and sort
Merge branch 'master' of github.com:cschep/schepball

Conflicts:
	app/views/dashboard/index.html.erb
	app/views/layouts/application.html.erb
	app/views/players/index.html.erb
	vendor/assets/stylesheets/bootstrap.css