changed ip address back to zach
Merge branch 'master' of github.com:jonleung/magicwand