add to ignore
change to local domain
Merge remote-tracking branch 'origin/master' into gh-pages

* origin/master:
  change to local domain
  add to ignore