Merge remote-tracking branch 'origin/navbar' into navbar

src/components/NavbarComponent.vue

+<template>
+
+</template>
+
+<script>
+export default {
+  name: "NavbarComponent",
+};
+</script>
+
+<style scoped></style>