Merge branch 'master' of https://github.com/ReadUpCode/readup

Conflicts:
	app/controllers/items.js