fixed karls shit
Merge branch 'master' of github.com:fishplate/davidscarpets