just setting up my repo on the CS computers
Merge branch 'master' of https://github.com/himmelwr/Thesis