Unpretty collision detection to play with.
Merge branch 'master' of https://github.com/NCFDev-Fall2013/Cellular-II into 0.1.Billy

Conflicts:
	cells.py