views with haml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/items_controller.rb
	app/views/items/index.html.erb