123
Code
Merge branch 'master' of https://github.com/UBCSolarSimulation/Simulator.git
test
tet
test
Revert "Added Free Resources for learning Java"

This reverts commit 3ede7c23420774587707da3690f927827268bb7a.
Merge branch 'master' of https://github.com/UBCSolarSimulation/Simulator.git