sync
Merge branch 'master' of github.com:Michieljoris/url_washer

Conflicts:
	wash.js