house prop working
Merge branch 'master' of https://github.com/korffo/UNIHH-DIS-SS14.git