merge
Merge branch 'master' of https://github.com/Catpaw42/Area51.git

Conflicts:
	Christians_Algoritmer/Algoritmer/src/pacman/Pacman3.java