fsda
Merge branch 'master' of https://github.com/AdmiralPotato/ggj2013

Conflicts:
	Server/Web/client/index2.html
Merge branch 'master' of https://github.com/AdmiralPotato/ggj2013

Conflicts:
	Server/Web/client/js/game.js
isLocal flag working.