Added lib/convert.rb -- a multi units converter.
Fixed some conflicts.