Merge branch 'master' of https://github.com/spencerking/CSE20212-Final-Project

Conflicts:
	jpeg.cpp
merge