rm trash
Merge branch 'master' into marks

Conflicts:
	.gitignore
rm trash 2