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