converting everythign to inches now
Merge branch 'master' of https://github.com/ackinsey/sosa