fixed composer.json
Merge pull request #46 from TAwesome/rissa

Rissa
Merge pull request #47 from TAwesome/Jacob

fixed composer.json
Composer.lock updated
Merge pull request #48 from TAwesome/Jacob

Composer.lock updated
Merge branch 'master' into rissa
fixed the stuff