commiting for merging process.
Merging with Sam.
Have unit tests for vertex class working.
for merging purposes.
merged with Josh.
Merge branch 'master' of https://github.com/shamor/Senior-Design-I

Conflicts:
	src/main.cpp
Moved vec2Vertex into imageProcessor.  Adjusted main as needed.
removed standalone vec2vertex, as it has been moved to imageProcessor.
minor changes to Makefile
Merge branch 'master' of https://github.com/J-Fid/Senior-Design-I
merge with josh