Changes for webinar
Merge branch 'master' of git@github.com:nataliab/twitter_fb_mashup.git

Conflicts:
	vendor/autoload.php
	vendor/composer/ClassLoader.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_namespaces.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
	vendor/zendframework/zendoauth/library/ZendOAuth/Client.php