Humble beginnings
Merge pull request #2 from Wartz/master

gimmie2
Merge branch 'master' of https://github.com/tsclhlimmer/World-Units-to-Superior-American
stuff
Merge pull request #2 from tsclhlimmer/master

Combine our stuff