test
Merge remote-tracking branch 'origin/items'

Conflicts:
	config/database.yml
Removed database.yml
Removed database.yml
Removed database.yml
63
reload
Merged master fixed conflict.