# Conflicts:
#	package-lock.json
#	package.json
#	src/app/app.module.ts
#	src/app/overview/overview.component.ts