checkpoint
Merge branch 'development' of github.com:dangerousbeans/doc_smoosher into development