changed ip address to Mike's comp and corrections from flawed merge
Merge branch 'master' of github.com:mikekvintus/aha