corrects indentation in requestHandler.js.
sd
Merge branch 'addisonBranch'

Conflicts:
	backend/requestHandler.js
Merge branch 'addisonBranch'

Conflicts:
	backend/requestHandler.js
resolves merge conflicts with requestHandler.js.
oneArticle: filtered paragraphs with no text, added hashtag section, added image component for signup
Added feature for api connection to twitter feed
Merge branch 'mongo'
saves each version of article on articleId
updates readme to include instructions for setting diffbot API key.
removes all references to restartMongo().
Merge branch 'will'

Conflicts:
	app/modules/articles/articleservice.js
	app/modules/articles/onearticle.html
	app/modules/articles/onearticlecontroller.js
	backend/requestHandler.js
removes unnecessary comments.
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
removed Profile section, updated css
fixes load error.
Merge branch 'eugeneTimeline'
Merge branch 'addisonBranch'

Conflicts:
	app/modules/articles/onearticlecontroller.js
updates to onearticleHTML