Merge branch 'Prolifiq-Notes' of https://github.com/ullmers/workNotes into Prolifiq-Notes

Conflicts:
	emacstest
fixthis

fix