Updated master after merge conflicts

Change-Id: Ibea933c20071cc85201420ba1e31fedf9356f55b
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>
diff --git a/app/common/styles/base/mixins.scss b/app/common/styles/base/mixins.scss
index 79b0f34..6067a0e 100644
--- a/app/common/styles/base/mixins.scss
+++ b/app/common/styles/base/mixins.scss
@@ -36,7 +36,7 @@
 }
 
 @mixin fontCourierBold {
-  font-family: "Courier New", Helvetica, monospace, arial, sans-serif;
+  font-family: "Courier New", Helvetica, arial, sans-serif;
   font-weight: 700;
 }