sort by cost and date
Merge branch 'master' of https://github.com/tsg9292/atlas

Conflicts:
	config/routes.rb
hello