Fix end condition
Merge branch 'master' of github.com:horsman/pegjam2014