picture
Merge branch 'master' of https://github.com/tomiberes/trashure

Conflicts:
	client/scripts/views/newTrash.js
	client/templates/newTrash.hbs