starting textbook view
Merge remote-tracking branch 'mike/master'
working on textbook view
Merge remote-tracking branch 'github/master'