added p's room
Merge branch 'origin/develop' of https://github.com/tpott/butter-star into develop