Ready ready
Merge branch 'master' of github.com:steinunn8/Pac-Man

Conflicts:
	js/entityManager.js
	js/sprites.js