updates
Merge branch 'master' of github.com:chriscnc/study-topics