src/client <-> public/js
src/client <-> public/js
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore