A helluva lot of moving around
Merge branch 'master' of https://github.com/jpwilliams/I-A-3-Documentation