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
Merge branch 'addisonBranch'

Conflicts:
	backend/requestHandler.js