start in the desert
Merge branch 'dev' of github.com:glifchits/goldenapple into dev