Addded guard etc
merg
Merge branch 'master' of https://github.com/basvdaakster/ld28