Added Twitter API.
Merge branch 'master' of github.com:ben100691/webprogramming2

Conflicts:
	twitter.php