update
Merge branch 'master' of https://github.com/pannellr/wiki_class_notes