switching computers
Merge branch 'master' of github.com:tcfritchman/paddle

added other stuff