test
Merge branch 'master' of https://github.com/kylelin47/COP-Project

Conflicts:
	src/main.cpp
Merge branch 'master' of https://github.com/kylelin47/COP-Project into working
Final merge