Add Composition
Merge branch 'master' of github.com:brettshollenberger/ruby_wiki