Maitre Capelo.
Merge branch 'master' of github.com:Evangenieur/InstantMarket

Conflicts:
	server.coffee
Some CSS on Chat view