init
Merge branch 'master' of https://github.com/ericmick/a-small-room