Room stuff added
Merge branch 'master' of https://github.com/andva/granny