mashups!
add brief docs to mashup
Merge branch 'master' of github.com:benesch/mootifs

Conflicts:
	mashup.py