removed consoles
saves timeline in post.timeline, instead of creating a new collection per article
Merge branch 'eugeneTimeline'

Conflicts:
	backend/requestHandler.js
Removes all API keys from publicly accessible files and moves them to config.js.
includes timeline array when initially creating article collection
includes bower.json
includes app/lib to gitignore / .bowerrc
includes .bowerrc
serves up dependencies via app/bower.json
includes bower.json/.bowerrc in main folder
removes bowerrc/bower.json from app folder
Adds variables that reference api keys.
Merge branch 'master' into mongo
removed console logs
Merge branch 'master' of https://github.com/XYZMedia/shortProject

Conflicts:
	backend/requestHandler.js
Refactors mongoDB configuration.
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