More edits
Merge github.com:archaeogeek/aging_githubtalk into gh-pages
Merge github.com:archaeogeek/aging_githubtalk into gh-pages
Merge branch 'gh-pages' of github.com:archaeogeek/aging_githubtalk into gh-pages
Final version
Merge pull request #1 from archaeogeek/gh-pages

Merging gh-pages and master branch