Merged with Shane.
Merge branch 'master' of https://github.com/J-Fid/Senior-Design-I
Merged with Jason, cleaned up his code and fixed vec2vertex class so it will actually do something productive.