Merge branch 'master' into RobMasterBranch
Smartphone edit
Merge remote-tracking branch 'origin/master' into RobMasterBranch
Sensor additions
Merge pull request #7 from RARyan/RobMasterBranch

Rob master branch
Merge remote-tracking branch 'origin/master' into JoshBranch

Conflicts:
	src/sensors/Sensor.java