240413
Merge branch 'master' of github.com:SleepyFloyd/Diss

Conflicts:
	scratchpad_full.tex