Third milestone simon initial
Merge branch 'master' of https://github.com/potater/pvc-projekt