Adding composer.json
Update README.markdown

Corrected grammar
Merge pull request #23 from schnauss/master

Update README.markdown
Merge branch 'develop'

Conflicts:
	composer.json
Merge pull request #31 from krolow/develop

Merging develop
Adding note about autoload
Merge pull request #36 from krolow/develop

Merge develop changes
Merge branch 'master' into develop