add book stuff.
Merge origin/master