Merged slight changes
Merge branch 'master' of https://github.com/UBCSolarSimulation/Simulator.git