cleanup in player
DialogueManager added to game
Made dialogueManager a singleton
Game1 cleanup
merge branch?
Resolved conflict
Resolved Conflict
Merge branch 'Project-folder' of https://github.com/Pingli/PjBackToBasics into Project-folder

Conflicts:
	YUME/Game2.cpp
try 3