WS module
Merge branch 'master' of https://github.com/fggconitsha/fggconitsha.github.io

Conflicts:
	package.json