Merge branch 'master' into gh-pages

This commit is contained in:
Jeff Parsons 2016-12-08 17:05:39 -08:00
commit 30811a1651
19 changed files with 1242 additions and 989 deletions

File diff suppressed because one or more lines are too long