Local Sensor commit.
Merge remote-tracking branch 'origin/RobMasterBranch'

Conflicts:
	src/sensors/Sensor.java
Sensor class now takes sensorType, errorRange, and errorBias.
Merge pull request #9 from RARyan/RobMasterBranch

Rob master branch
Merge pull request #10 from RARyan/JoshBranch

Sensor class now takes sensorType, errorRange, and errorBias.
Changed Sensor to GenericSensor and made Sensor a subclass of Generic
Sensor. Sensor represents the Android Sensor and GenericSensor
represents the sensors external to the Smartphone.