change ip address
change ip address again
Merge branch 'master' of https://github.com/mclearc/Wiki