removed console logs
Merge branch 'master' of https://github.com/XYZMedia/shortProject

Conflicts:
	backend/requestHandler.js
onearticle timeline working
Merge branch 'addisonBranch'

Conflicts:
	app/modules/articles/onearticlecontroller.js
	backend/requestHandler.js
Merge branch 'mongo'

Conflicts:
	backend/requestHandler.js
removed api key
userService now returns user object
updated css for timeline
removed comments and unnecessary code from allarticlecontroller
fixed timeline to display correctly. updated contributor image in modal
Delete azure.err
Delete myCert.cer
Delete myCert.pem
Delete myPrivateKey.key
Merge branch 'addisonBranch'

Conflicts:
	app/config.js
does not have debugging console logs
Adds Gulp to project.