added requirements

added requirements
Merge branch 'master' of https://github.com/fuzzypeanut/fuzzypeanut

Conflicts:
	composer.json