got lines things
merged
more things
fixed merged
Merge branch 'master' of https://github.com/nbalas/climate_tool