Converted spaces to tabs for indentation.
Merge branch 'master' into gh-pages

* master:
  Converted spaces to tabs for indentation.
Added Google Analytics