no actual changes
Merge branch 'master' of
https://github.com/UBCSolarSimulation/Simulator.git

Conflicts:
	StrategySystem/src/com/ubcsolar/ui/GUI.java