No deberia commitear esto
Merge branch 'master' of https://github.com/arcticmicho/pacmanmultiplayer into StageObject

Conflicts:
	new/js/pacman-noobteam.html
Fixed web page
Merge branch 'master' of https://github.com/arcticmicho/pacmanmultiplayer