Merge branch 'master' of https://github.com/culaucon/winlik

Conflicts:
	package.json
changed web.js