add item
select item
Merge branch 'item' of https://github.com/Blackening999/test2

Conflicts:
	db/development.sqlite3
	log/development.log