Update all for new machine
Update for new machine
Merge branch 'master' of github.com:bsandusky/sample_app