good point
Merge branch 'master' of github.com:schleary/p-patch-Salmon

Conflicts:
	dump.rdb