Merge branch 'master' of https://github.com/jcoady9/Senior-Design-I
Have the image scaling function working.
Merge branch 'master' of https://github.com/J-Fid/Senior-Design-I

Conflicts:
	Makefile
	linetest
	vertextest