added to main
Merge branch 'master' of https://github.com/atang930606/cpsc310-gitlab-part4

Conflicts:
	ProjectEuler20.cpp

brandon - fixed conflict