Add www/cowboy
Merge

Conflicts:
	www/cowboy/Makefile