NEW
Merge branch 'master' of https://github.com/Snack-Man/Snack-Man

Conflicts:
	Resources/Player/pac.png