stash
Merge branch 'master' of https://github.com/k0reanach0/WebWorks

Conflicts:
	1-VoIP/quote-v3.html