# Conflicts:
#	.env
#	components/Foot.vue
#	components/home/projectFeatures.vue
#	components/home/schoolRanking.vue
#	components/rightAside.vue