Committing changes to demo.
erge branch 'master' of https://github.com/dpfau/altai

Conflicts:
	yeti/demo.m
I do not understand git well enough to do this in a not-hacky way. Resolving merge difference with a hatchet.