cccc
Merge branch 'master' of https://github.com/mittelman/stamush

Conflicts:
	file