update from crossroads
Merge branch 'master' of github.com:brianchenming/notes