error
saves current version of post to db.(articleId+'timeline') right before edit happens
Merge branch 'eugeneVote'

Conflicts:
	backend/requestHandler.js
	backend/server.js
removes console logs
removes console logs
updated newEdit and voteUP functions on OneArticle page
Merge branch 'master' of https://github.com/XYZMedia/shortProject into addisonBranch

Conflicts:
	backend/requestHandler.js
	backend/server.js
Resolved all conflicts
updating editParagraph swap - not functional
sd
Merge branch 'addisonBranch'

Conflicts:
	backend/requestHandler.js
deleted duplicate editParagraph function in requestHandler
Merge branch 'addisonBranch'

Conflicts:
	backend/requestHandler.js
resolves merge conflicts with requestHandler.js.