Adding composer.json to work with Composer
Merge branch 'master' of github.com:stephandesouza/twitteroauth

Conflicts:
	composer.json