Trying again. Bleeerrrrrrggggggg
Merge github.com:Diogenesthecynic/Bookswap