Initial commit
Merge branch 'master' of https://github.com/JanDintel/studenthouse
Merge branch 'master' of https://github.com/JanDintel/studenthouse into washmachine