andrew's stuff
Merge branch 'master' of github.com:mateoi/bookaroom