items! items everywhere...
Merge branch 'master' of github.com:shaief/household

Conflicts:
	.meteor/.id
Merge branch 'master' of github.com:shaief/household

Conflicts:
	server/fixtures.js