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

Conflicts:
	PacMan/PacMan/Blinky.cpp
	PacMan/PacMan/Pinky.cpp

Signed-off-by: unknown <reku12@G311-0024.students.ad.bth.se>
Merge branch 'PacuManuPlayer' of https://github.com/Team-Quagga/PacMan.git
PACMAN FUNKAAAAAAR
Signed-off-by: unknown <reku12@G311-0024.students.ad.bth.se>
fel
Merge branch 'master' of https://github.com/Team-Quagga/PacMan.git into PacuManuPlayer

Conflicts:
	PacMan/PacMan/Player.cpp

Signed-off-by: unknown <dahi12@G311-0022.students.ad.bth.se>