ehehehehehehehehehehe
Merge branch '0.1.TestVectorsDisplay' of https://github.com/NCFDev-Fall2013/Cellular-II into 0.1.TestVectorsDisplay
how does this work?
Conflicts:
	test.py