Update package.json
Deleted mongo query in login.
signup/newpost qeuries mongo.
Merge branch 'eugene_serverside_auth' of https://github.com/XYZMedia/shortProject into eugene_serverside_auth
Merge branch 'eugene_serverside_auth'

Conflicts:
	backend/requestHandler.js
	backend/server.js
signup/login correctly references to the database.
Merge branch 'eugene_serverside_auth'

Conflicts:
	backend/requestHandler.js
Merge remote-tracking branch 'origin/addisonBranch'

Conflicts:
	app/modules/articles/newpostcontroller.js
	backend/requestHandler.js
	backend/server.js
	package.json
retrieves an article via its id.
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