Coersion partially complete: commiting to change how bid preferences work.
Commit to merge: no other changes...
Merge branch 'master' of https://github.com/tigrennatenn/Choron

Conflicts:
	app/controllers/.home_controller.rb.swp
	app/views/home/.get_preferences_list.html.erb.swp
	config/.routes.rb.swp
	todo.txt
Fixed missing end in auction.rb