final updates
merge conflicts
merge conflicts
Merge branch 'gh-pages' of https://github.com/hypertiny/tito-blog into gh-pages