more reasonable behavior for squirrelbot
Merge branch 'master' of github.com:dmazin/asteroid-tycoon
Fixing locks
Merge branch 'master' of https://github.com/dmazin/asteroid-tycoon
Merge branch 'master' of github.com:dmazin/asteroid-tycoon into upgrades