Added man
We've gone down the rabbit hole
Merge branch 'master' into man
yolo