Cleaning up vending machine code...
Trying to bring things up to date...

Merge branch 'master' of https://github.com/uid0/hive-rails-access

Conflicts:
	app/controllers/members_controller.rb
	db/schema.rb