collapsed update
Merge branch 'lucia' of github.com:geekyMoa/gbg into lucia