removed floor1.bmp
Merge branch 'master' of github.com:kbladin/Modeling-project