yep
head tats
Merge branch 'conty' of /home/s/stylehouse into conty

Conflicts:
	stylehouse.pl
clatter
bang