Added feature for api connection to twitter feed
Merge branch 'will'

Conflicts:
	app/modules/articles/articleservice.js
	app/modules/articles/onearticle.html
	app/modules/articles/onearticlecontroller.js
	backend/requestHandler.js
Merge branch 'master' of https://github.com/XYZMedia/shortProject

Conflicts:
	backend/requestHandler.js
	backend/server.js
Merge branch 'master' of github.com:XYZMedia/shortProject

Conflicts:
	backend/requestHandler.js