Have Line Tests working.  Cleaned up vertex tests.
Merge branch 'master' of https://github.com/shamor/Senior-Design-I

Conflicts:
	Makefile
	tests/scaleTest.cpp
	tests/vertexTests.cpp
Merged with Jason.