initial checkin
Merge branch 'master' of github.com:craigadams/measurement_converter