ritat ut världen
Signed-off-by: unknown <dahi12@G311-0013.students.ad.bth.se>
Merge branch 'master' of https://github.com/Team-Quagga/PacMan.git

Conflicts:
	PacMan/PacMan/Tile.h
	PacMan/PacMan/World.cpp
	PacMan/PacMan/World.h