Removed custom ConvertUnits class :)
Merge branch 'master' of github.com:Dragonborns/besnipilici
Resolved merge conflict