done for the day
Merge branch 'master' of github.com:maxg0/gw1