Merge branch 'patch-1' of https://github.com/tomhorvat/bootstrap into tomhorvat-patch-1

diff --cc scss/_variables.scss
index cafd887c1e9e273dfd0ff097420cf6caeb60a3f1,46c06b0475509599cf94bb481c608c2849554ec2..4b5af26ad0cd2adf2d51dd635e9f895583ec6236
--- 1/scss/_variables.scss
--- 2/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -218,9 -193,8 +218,10 @@@ $font-size-lg:   1.25rem !default
  $font-size-sm:   .875rem !default;
  $font-size-xs:   .75rem !default;
  
 -$font-weight-base: normal !default;
 +$font-weight-normal: normal !default;
 +$font-weight-bold: bold !default;
  
++$font-weight-base: $font-weight-normal !default;
  $line-height-base: 1.5 !default;
  
  $font-size-h1: 2.5rem !default;