Fix c++ error
Merge remote-tracking branch 'origin/master' into gh-pages
add book.png
Merge
Merge pull request #9 from theofilis/gh-pages

Merge