xx
xx2
Merge branch 'master' of github.com:flunder/synrck

Conflicts:
	app/controllers/items_controller.rb
	app/models/item.rb