Starting on the Environment unit tests
Resolved conflicts (maybe?)
Merge branch 'master' of https://github.com/NCFDev-Fall2013/Cellular-II

Conflicts:
	test.py