added
Merge branch 'master' of github.com:jonleung/magicwand
Merge branch 'master' of github.com:jonleung/magicwand
Merge branch 'master' of github.com:jonleung/magicwand
updated ip addresses