Removed Old
Merge branch 'master' of https://github.com/nchen94/CEN3031Project

Conflicts:
	meanjs/.bowerrc
	meanjs/.csslintrc
	meanjs/.editorconfig
	meanjs/.gitignore
	meanjs/.jshintrc
	meanjs/.slugignore
	meanjs/.travis.yml
	meanjs/Dockerfile
	meanjs/LICENSE.md
	meanjs/Procfile
	meanjs/README.md
	meanjs/app/controllers/articles.server.controller.js
	meanjs/app/controllers/core.server.controller.js
	meanjs/app/controllers/errors.server.controller.js
	meanjs/app/controllers/users.server.controller.js
	meanjs/app/controllers/users/users.authentication.server.controller.js
	meanjs/app/controllers/users/users.authorization.server.controller.js
	meanjs/app/controllers/users/users.password.server.controller.js
	meanjs/app/controllers/users/users.profile.server.controller.js
	meanjs/app/models/article.server.model.js
	meanjs/app/models/user.server.model.js
	meanjs/app/routes/articles.server.routes.js
	meanjs/app/routes/core.server.routes.js
	meanjs/app/routes/users.server.routes.js
	meanjs/app/tests/article.server.model.test.js
	meanjs/app/tests/user.server.model.test.js
	meanjs/app/views/404.server.view.html
	meanjs/app/views/500.server.view.html
	meanjs/app/views/index.server.view.html
	meanjs/app/views/layout.server.view.html

	meanjs/app/views/templates/reset-password-confirm-email.server.view.html
	meanjs/app/views/templates/reset-password-email.server.view.html
	meanjs/bower.json
	meanjs/config/config.js
	meanjs/config/env/all.js
	meanjs/config/env/development.js
	meanjs/config/env/production.js
	meanjs/config/env/test.js
	meanjs/config/express.js
	meanjs/config/init.js
	meanjs/config/passport.js
	meanjs/config/strategies/facebook.js
	meanjs/config/strategies/github.js
	meanjs/config/strategies/google.js
	meanjs/config/strategies/linkedin.js
	meanjs/config/strategies/local.js
	meanjs/config/strategies/twitter.js
	meanjs/fig.yml
	meanjs/gruntfile.js
	meanjs/karma.conf.js
	meanjs/package.json
	meanjs/public/application.js
	meanjs/public/config.js
	meanjs/public/dist/application.js
	meanjs/public/dist/application.min.css
	meanjs/public/dist/application.min.js
	meanjs/public/humans.txt
	meanjs/public/modules/articles/articles.client.module.js
	meanjs/public/modules/articles/config/articles.client.config.js
	meanjs/public/modules/articles/config/articles.client.routes.js

	meanjs/public/modules/articles/controllers/articles.client.controller.js
	meanjs/public/modules/articles/services/articles.client.service.js
	meanjs/public/modules/articles/tests/articles.client.controller.test.js
	meanjs/public/modules/articles/views/create-article.client.view.html
	meanjs/public/modules/articles/views/edit-article.client.view.html
	meanjs/public/modules/articles/views/list-articles.client.view.html
	meanjs/public/modules/articles/views/view-article.client.view.html
	meanjs/public/modules/core/config/core.client.routes.js
	meanjs/public/modules/core/controllers/header.client.controller.js
	meanjs/public/modules/core/controllers/home.client.controller.js
	meanjs/public/modules/core/core.client.module.js
	meanjs/public/modules/core/css/core.css
	meanjs/public/modules/core/img/brand/favicon.ico
	meanjs/public/modules/core/img/brand/logo.png
	meanjs/public/modules/core/img/loaders/loader.gif
	meanjs/public/modules/core/services/menus.client.service.js
	meanjs/public/modules/core/tests/header.client.controller.test.js
	meanjs/public/modules/core/tests/home.client.controller.test.js
	meanjs/public/modules/core/views/header.client.view.html
	meanjs/public/modules/core/views/home.client.view.html
	meanjs/public/modules/users/config/users.client.config.js
	meanjs/public/modules/users/config/users.client.routes.js

	meanjs/public/modules/users/controllers/authentication.client.controller.js
	meanjs/public/modules/users/controllers/password.client.controller.js
	meanjs/public/modules/users/controllers/settings.client.controller.js
	meanjs/public/modules/users/css/users.css
	meanjs/public/modules/users/img/buttons/facebook.png
	meanjs/public/modules/users/img/buttons/github.png
	meanjs/public/modules/users/img/buttons/google.png
	meanjs/public/modules/users/img/buttons/linkedin.png
	meanjs/public/modules/users/img/buttons/twitter.png
	meanjs/public/modules/users/services/authentication.client.service.js
	meanjs/public/modules/users/services/users.client.service.js

	meanjs/public/modules/users/tests/authentication.client.controller.test.js
	meanjs/public/modules/users/users.client.module.js

	meanjs/public/modules/users/views/authentication/signin.client.view.html

	meanjs/public/modules/users/views/authentication/signup.client.view.html

	meanjs/public/modules/users/views/password/forgot-password.client.view.html

	meanjs/public/modules/users/views/password/reset-password-invalid.client.view.html

	meanjs/public/modules/users/views/password/reset-password-success.client.view.html

	meanjs/public/modules/users/views/password/reset-password.client.view.html

	meanjs/public/modules/users/views/settings/change-password.client.view.html

	meanjs/public/modules/users/views/settings/edit-profile.client.view.html

	meanjs/public/modules/users/views/settings/social-accounts.client.view.html
	meanjs/public/robots.txt
	meanjs/server.js