more updates
Merge branch 'master' of github.com:wasted-us/wasted-us