adding changes
Merge branch 'master' of github.com:pannellr/wiki_class_notes