Merge remote-tracking branch 'origin/master'

# Conflicts:
#	css/theme.min.css

README.md

@@ -1,5 +1,13 @@
 Start talking: [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/holger1411/understrap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge)
 
+## About
+
+I’m a huge fan of Underscores, Bootstrap, and Sass. Why not combine these into a solid WordPress Theme Framework?
+That’s what UnderStrap is. 
+You can use it as starter theme and build your own theme on top of it. Or you use it as parent theme and create your own child theme for UnderStrap.
+
+At the moment, UnderStrap is in a very early stage. But if you wan’t, feel free to use it for your own WordPress theme!
+
 # UnderStrap WordPress Theme Framework
 
 Website: [http://understrap.com](http://understrap.com)
@@ -73,12 +81,6 @@ Child Theme Project: [https://github.com/holger1411/understrap-child](https://gi
 
             - **0.1 Dec. 10th 2014 - First commit**
 
-## About
-
-I’m a huge fan of Underscores, Bootstrap, and Sass. Why not combine these into a solid WordPress Theme Framework?
-That’s what UnderStrap is (or will be…)
-
-At the moment, UnderStrap is in a very early stage. But if you wan’t, feel free to use it for your own WordPress theme!
 
 ## Basic Features
 

css/theme.css

@@ -4595,8 +4595,9 @@ a.bg-danger:focus, a.bg-danger:hover {
 .entry-footer span {
   padding-right: 10px; }
 
-img.wp-post-image, article img, figure {
-  max-width: 100%; }
+img.wp-post-image, article img, figure, img {
+  max-width: 100%;
+  height: auto; }
 
 a.skip-link {
   z-index: 1000;

inc/customizer.php

@@ -64,21 +64,6 @@ function understrap_theme_customize_register( $wp_customize ) {
         'settings'   => 'understrap_theme_slider_loop_setting'
     ) );
 
-    $wp_customize->add_section( 'understrap_theme_script_options', array(
-        'title'          => __( 'Add custom code snippet', 'understrap' )
-    ) );
-
-    $wp_customize->add_setting( 'understrap_theme_script_code_setting', array(
-        'default'        => '',
-        'sanitize_js_callback' => 'esc_js'
-    ) );
-
-    $wp_customize->add_control( 'understrap_theme_script_code', array(
-        'label'      => __( 'Add custom header code here. Like <script>yourcode</script> or <style>yourstyle</style> tags.', 'understrap' ),
-        'section'    => 'understrap_theme_script_options',
-        'type'       => 'textarea',
-        'settings'   => 'understrap_theme_script_code_setting'
-    ) );
 }
 add_action( 'customize_register', 'understrap_theme_customize_register' );
 

sass/understrap/understrap.scss

@@ -54,8 +54,9 @@ font-size:inherit;
 }
 
 //Limit featured image size to 100%
-img.wp-post-image, article img, figure {
+img.wp-post-image, article img, figure, img {
 	max-width: 100%;
+  height: auto;
 }
 
 // Skip to content link
@@ -166,13 +167,7 @@ right: 0px;
   li {
     list-style: square;
     padding-left: 0px;
-
-    a {
-
   }
-
-  }
-
 }
 
  .dropdown-menu .menu-item {
@@ -181,4 +176,3 @@ right: 0px;
       background-color:$brand-primary;
     }
   }
-