Adding my name to the portions that I edited
Merge branch 'master' of github.com:nks5295/Composite