Fix references
Add template alphas table
Merge branch 'master' of https://github.com/dlont/ThesisHamburg

Conflicts:
	bibliography/bibliography.bib