now with choice page for leaf items !
Merge branch 'master' of https://github.com/Ben-Jam/benjam-rails

Conflicts:
	app/views/items/index.html.erb