Unit converter added
Merge branch 'master' of https://github.com/qdickinson/KatieQuinnTom407