working on guards some more
Merge branch 'master' of github.com:peterandclay/pixel-casino