reset to last hg commit
Merge branch 'master' of https://github.com/marvin-hansen/Diploma

re-basing to last hg commit