includes voteUp function with http request on '/voteUp'
some console.logs removed
Merge branch 'master' of https://github.com/XYZMedia/shortProject into eugeneVote
references edits
voting works
includes handler.editParagraph - swaps currentparagraph with proposed text
Merge branch 'addisonBranch' of github.com:XYZMedia/shortProject into addisonBranch

Conflicts:
	app/modules/articles/onearticlecontroller.js
	app/modules/user/login/logincontroller.js
updated newEdit and voteUP functions on OneArticle page