stuff
Merge branch 'master' of https://github.com/thundercloud90/BookBazaar