Updating Base and Room classes, and adding view
Merge branch 'master' of https://github.com/segerphilip/sofdesfinal