EndOfProjectComparison

Merging the master branch with the solar collector branch to make sure everything works/merges smoothly before including solar collector in release