Added last text for AwardTypes and AwardOrganizations
Merge branch 'master' of github.com:Thalmann/courses

Conflicts:
	main.tex