Merge branch 'master' of ssh://khuhub.khu.ac.kr:12959/2020-1-capstone-design1/Triz_Project1

@@ -3,13 +3,12 @@ import ReactDOM from 'react-dom';
 import './mainpage/main.css';
 
 import HelloKhu from './mainpage/main';
-import KhuIcon from './mainpage/main';
+
 
 
 ReactDOM.render(
   <React.StrictMode>
    <HelloKhu/>
-   
   </React.StrictMode>,
   document.getElementById('root')
 );

@@ -22,4 +22,11 @@ class KhuIcon extends Component {
   }
 }
 
-
+export default () => {
+  return (
+    <>
+      <KhuIcon />
+      <HelloKhu />
+    </>
+  )
+};