hq update
erge branch 'master' of https://github.com/andykat/cowsandcows3