update to current
Merge branch 'master' of github.com:usagi/home