resolving repo issue caused by Dropbox resolving conflicts. Hope it works.
Merge branch 'gh-pages' of github.com:wovchko/inklings into gh-pages

Dropbox caused some issues with this repo by attempting to resolve a few sync conflicts.  Let's hope this fix works.