completed setup script
Merge branch 'master' of github.com:mannyjl625/workspace