add data structures
add some stuff
more things
Merge branch 'master' into gh-pages
update book