commit this version
Merge branch 'master' of https://github.com/rschen7754/cs174a

Conflicts:
	Final Project/Final Project/main.cpp