Added in the Mixer
Merge branch 'master' of https://github.com/muthukdi/CppFinalProject

Conflicts:
	Game.cpp