Got sorting results working, looks bad and needs CSS but works
Merge branch 'master' of github.com:szarmes/dbProject

Conflicts:
	app/views/search/search.html.erb