Second commit
Merge branch 'master' of https://github.com/danielwarna/trashmate

Conflicts:
	README.md