working on sort option
Merge branch 'master' of github.com:walterlatimer/rainforest

Conflicts:
	app/controllers/application_controller.rb