Signed-off-by: unknown <sisv12@G311-0011.students.ad.bth.se>
Ljud tror vi fungerar som de ska nu

Signed-off-by: Hakeee <hapb12@G311-0011.students.ad.bth.se>
Merge branch 'master' into MasterRenderMarge
Merge branch 'master' of https://github.com/Team-Quagga/PacMan.git into MasterRenderMarge

Conflicts:
	PacMan/PacMan/GameScreen.cpp
	PacMan/PacMan/IGameObject.h
Ghost AI typ klar

Signed-off-by: unknown <sisv12@G311-0012.students.ad.bth.se>
Merge branch 'Ghost' of https://github.com/Team-Quagga/PacMan.git
Merge branch 'MasterRenderMarge' of https://github.com/Team-Quagga/PacMan.git

Conflicts:
	PacMan/PacMan/GameScreen.cpp
	PacMan/PacMan/GameScreen.h