Updated wireframe HTML and CSS

Author: Yonatanteklemariam

Wireframe/style.css

@@ -163,7 +163,10 @@ footer p {
   padding-left: 15px;
   padding-right: 15px;
   border-bottom: none;
+<<<<<<< HEAD
   /* optional: remove the thick bar */
+=======
+>>>>>>> 59daf8a (Updated wireframe HTML and CSS)
   border-radius: 10px;