Minor update
Merge branch 'master' of https://github.com/RARyan/PACSim

Conflicts:
	src/environment/CellTower.java
Merge pull request #4 from RARyan/myBranch

My branch
Merge pull request #5 from RARyan/RobMasterBranch

Attempting to implement some JUnit testing classes.
Added the Sensor abstract class.
Merge branch 'master' of https://github.com/RARyan/PACSim
Merge pull request #6 from RARyan/RobMasterBranch

Rob master branch
Merge branch 'master' of https://github.com/RARyan/PACSim
Added the method getType() to the Sensor class. Modified the Sensor
constructor to accept a type assignment (accelerometer, gyroscope, etc.)
in the form of an integer.
Merge branch 'master' into RobMasterBranch
Smartphone edit
Merge remote-tracking branch 'origin/master' into RobMasterBranch
Sensor additions