Update readme
Update readme
Update readme
Update readme
Update readme
Fix merge conflicts
Merge branch 'gh-pages' of github.com:davidcmoulton/k-touch into gh-pages