Merge branch 'master' of https://github.com/PJackson01/solarsizer.git