add team to readme

Author: apark0720

README.md

@@ -3,24 +3,31 @@
 Spearmint helps developers easily create functional React tests without writing any code. It dynamically converts user inputs into executable Jest test code by using DOM query selectors provided by the react-testing-library.
 
 ## How to use
-Download spearmint @ spearmintjs.com. Available for Mac OS, Windows, and Linux.  To run tests generated by spearmint install jest, jest-dom, react-testing-library, and test-data-bot in your dev dependencies.
+
+Download spearmint @ spearmintjs.com. Available for Mac OS, Windows, and Linux. To run tests generated by spearmint install jest, jest-dom, react-testing-library, and test-data-bot in your dev dependencies.
 
     npm i -D jest jest-dom @testing-library/react test-data-bot
 
 ## How it works
+
 1.  On the initial screen, enter the URL of your project and load your React application to start creating tests.
-    
 
 ![](https://lh4.googleusercontent.com/CAFpoefRUUxgNosudQuc7gabSReFiI_puZ_WTjrzUSzB6pgOUdQ1babF2mxJql2lC8TQ-jjVLOgG5Qka8SUfF2fi-u2H9xSP7rZ_0Udpj-ISFPAY028UYKIUZcgOApnipVZwE7xh)
 
 2.  Utilize our auto-complete, drop-down options, and tooltips features to easily create arrangement, action, and assertion test statements.
-    
 
 ![](https://lh5.googleusercontent.com/5VYUlGG5VDdZxdZEh5aokuilhKRp8B5QyVmxvtW_abLYCAzYN-s-el1oV5WMtGuTzbEO2I6l8Ys_yK2gC0fCi8ISHwjh4LlgezsrPWd7mDEtLbPqBYf1J4pgkGmfIV4yq4I_dpQg)
 
 3.  Refer to the browser view of your app that is displayed on the right to quickly identify values for your selectors and use the file directory to open up a code editor view to easily refer to your codebase for props information.
-    
-4.  Spearmint will then convert user input to dynamically generate a test file that will be saved inside a __tests__ folder, which you can use to run ‘npm test’ on.
-    
+
+4.  Spearmint will then convert user input to dynamically generate a test file that will be saved inside a **tests** folder, which you can use to run ‘npm test’ on.
 
 ![](https://lh4.googleusercontent.com/zE-ty31I22R7P9-ubFIb4ko6MOBb7r1-56cHX65h9AcF9IsE22RhPKMEdhyR0MJ3PbqNovj1uwxF2T5_klwZ2sWniXfCiXfaEysjQgH5NRskaDFNd-TOGce0oTMn2jPaPEGFHlEq)
+
+## Team
+
+> Alex [@apark0720](https://github.com/apark0720)  · 
+> Johnny [@johnny-lim](https://github.com/johnny-lim)  · 
+> Julie [@julicious100](https://github.com/julicious100)  · 
+> Natlyn [@natlynp](https://github.com/natlynp)  · 
+> Karen [@karenpinilla](https://github.com/karenpinilla)

src/containers/NavBar/__tests__/navBar.test.js

@@ -1,13 +1,8 @@
 test('renders the export file modal when the open new folder button is clicked', () => {});
 
-<<<<<<< HEAD
-test('renders the export file modal when the open new folder button is clicked', () => {
-});
-=======
 test('loads new project when new project is selected from modal', () => {});
 
 test('displays correct file name on project directory panel', () => {});
->>>>>>> 9468b287d7e918c9d06987fc60e2b7b97dbb76c5
 
 test('displays code view when code view button is clicked', () => {});