updated
Merge branch 'master' of github.com:jintonic/dots