PacMan somewhat rendering
Merge branch 'master' of github.com:steinunn8/Pac-Man

Conflicts:
	index.html
	js/game.js
Merge branch 'master' of github.com:steinunn8/Pac-Man