Added colour to props in Room 1
Merge branch 'master' of https://github.com/cakelake/FireFly