maj
Merge branch 'master' of https://github.com/M1INFO-GB/PacMan

Conflicts:
	PacMan++/build-pacman-Desktop_Qt_5_1_1_MinGW_32bit-Debug/debug/pacman.exe