stuff
Merge branch 'master' of https://github.com/jwhite007/Mashup

Conflicts:
	equake_mashup_wip.py