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>
Signed-off-by: unknown <dahi12@G311-0022.students.ad.bth.se>
Blinky funkar
Signed-off-by: unknown <dahi12@G311-0022.students.ad.bth.se>
Merge branch 'PacuManuPlayer' of https://github.com/Team-Quagga/PacMan.git
Allt Klaaaaaaaaaaaaaaaart!
Conflicts:
	PacMan/PacMan/GameScreen.cpp
	PacMan/PacMan/Player.cpp
	PacMan/PacMan/World.cpp
	PacMan/PacMan/World.h

Signed-off-by: unknown <reku12@G311-0029.students.ad.bth.se>