Updated files
Merge branch 'master' of https://github.com/Learnpril/Mastermind

Conflicts:
	Mastermind/Mastermind.cpp