Simulation
Merge branch 'master' of github.com:ChrisMH/ElectronicLoad

Conflicts:
	Simulation/Load Cell/LoadCell.log
	Simulation/Load Cell/LoadCell.raw