# Conflicts:
#	.idea/misc.xml
#	.idea/workspace.xml
#	dist/index.html
#	dist/static/js/manifest.2ae2e69a05c33dfc65f8.js.map
#	frontend/package.json
#	frontend/src/views/Home.vue
#	frontend/src/views/Project.vue