.
merge
.
Merge branch 'droom2' of github.com:spanner/droom into droom2
minor fixes
Merge branch 'droom2' of github.com:spanner/droom into droom2