More of the lala?
Merge branch 'master' of https://github.com/Thalmann/courses

Conflicts:
	AALG/SelfStudy1/main.tex