userInfo(username:username, role:role) is saved in $cookieStore.get('currentUser'), not $rootScope.currentUser
add logout function that refreshes the cookie to default anonymous user
Merge branch 'eugene_serverside_auth' of https://github.com/XYZMedia/shortProject into eugene_serverside_auth

Conflicts:
	app/config.js
	app/modules/articles/allarticlescontroller.js
	backend/requestHandler.js
Wired up db and angular code from the team to support posting with a redirect to the individual story.
Merge branch 'eugene_serverside_auth'

Conflicts:
	backend/requestHandler.js
comment our old function in requesthandler.js
Merge branch 'will'

Conflicts:
	app/modules/articles/onearticlecontroller.js
	app/modules/user/userservice.js
	backend/requestHandler.js
oneArticle pulls data from DB appropriately
oneArtcle paragraphs pull data appropriately in edit mode
updated article title to display appropriately
stores current user information in cookieStore.get('currentUser')
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
updated login controller to use currentUser object
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
error