Updated IN A record
Merge remote-tracking branch 'origin/master' into gh-pages
Merge branch 'gh-pages'