fixed merge conflits

Author: Elizabeth Zhong

src/views/About.vue

@@ -3,7 +3,6 @@
 
 <div class="content">
 
-    <NavGrid id='content-start' :gridItems="gridItems"></NavGrid>
 
     <h1 class="mt-12"> #!/ABOUT </h1>
     <p>
@@ -18,6 +17,7 @@ We cater to new and returning students alike, with a mix of events designed to h
 We're as passionate about computing as you are; we provide technical events to teach you new skills, as well as a fortnightly magazine to keep you updated on what's new and interesting within the university, school and industry.
 Most of all, we're here to help you settle in and have a great time at UNSW!
 </p>
+<NavGrid id='content-start' :gridItems="gridItems"></NavGrid>
 </div>
   </div>
 </template>

src/views/Home.vue

@@ -21,9 +21,10 @@
             data-adapt-container-width="true" data-hide-cover="true" data-show-facepile="true">
             <blockquote cite="https://www.facebook.com/csesoc" class="fb-xfbml-parse-ignore">
             <a href="https://www.facebook.com/csesoc">CSESoc UNSW</a></blockquote></div>
+            <!-- wait for component to load before rendering - add event listener -->
         </v-col>
         <v-col>
-            <h1> #!/UPCOMING EVENTS </h1>
+            <h1> #!/ANNOUNCEMENTS </h1>
             <ListComponent :listItems="listItems" />
         </v-col>
       </v-row>
@@ -33,6 +34,7 @@
 
 
       <!-- media slider - could be showcase of recent posts?? -->
+      <!-- how to pass in OPTIONS -->
       <Slider :items="items" class="my-10"/>
 
       <Events/>