minor change to fix environment
Merge branch '0.2.Unittesting' of https://github.com/NCFDev-Fall2013/Cellular-II into 0.2.Unittesting

Conflicts:
	environment.py