Add www trademate
Merge branch 'master' of github.com:clemenst/files

Conflicts:
	onrooby_dev.plugin.zsh