Add twitteroauth as a composer dependency
Merge branch 'master' of github.com:fadeit/fadeitdk

Conflicts:
	twitter-api/index.php