Merge branch 'master' into gh-pages
added klinic slab
Merge branch 'gh-pages' of https://github.com/patlick/rocketflyer into gh-pages