Setup script
Merge branch 'master' of github.com:tjflaagan/M2M

Setup Script