add files from other branch
Merge branch 'master' of github.com:coolaj86/waste