testing with composer.json
Merge branch 'master' of https://github.com/leckster/cs462