connect local to github
Merge branch 'master' of github.com:kriswan/cubiclife