Merge remote-tracking branch 'upstream/master'
Added a comma in composer file
Merge pull request #10 from purplefish32/master

Changed comma in composer.json