Mark's Commit
Merge branch 'Mark's-Branch'
Merge branch 'master' of https://github.com/robertzautke/Discussion2Repo

Conflicts:
	main.cpp