Commited before pull
Last version
Merge branch 'master' of https://github.com/arcticmicho/pacmanmultiplayer

Conflicts:
	.gitignore
	js/pacman-noobteam.html
	js/server.js