# Conflicts:
#	dist/index.html
#	dist/static/css/app.eac4f1c71ec55fb2dc63cc217ac69d40.css
#	dist/static/js/app.06a488154ea2633be5a5.js
#	index.html