added relations from gdocs
fixed formatting of relations
Merge branch 'master' of https://github.com/Thalmann/courses

Conflicts:
	DB/selfstudy2.tex