acceptable version of H1 finished
Merge branch 'master' of github.com:JorenB/tqc-thesis