diff --git a/README.md b/README.md
index 899ac06..d347b60 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,15 @@ Website: http://understrap.com
 
 Changelog
 =
+            - **0.3.7 Jan. 8th 2016**
+                   - Cleanup for submitting to WordPress.org theme repository:
+                        - Fixing sticky post problem
+                        - Fixing skip-to-content link
+                        - re-activating the admin bar
+                        - adding readme.txt
+                        - Fixing missing translation strings in comments template
+
+
             - **0.3.6 Jan. 4th 2016**
                    - Cleanup
                    - Updating dependencies
diff --git a/content-page.php b/content-page.php
index f15fff5..4564dac 100644
--- a/content-page.php
+++ b/content-page.php
@@ -14,7 +14,7 @@
 
 	</header><!-- .entry-header -->
 
-    <?php echo get_the_post_thumbnail( $post_id, 'large' ); ?> 
+     <?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?> 
     
 	<div class="entry-content">
 
diff --git a/content-single.php b/content-single.php
index 8c6eead..a38acf6 100644
--- a/content-single.php
+++ b/content-single.php
@@ -18,7 +18,7 @@
 
 	</header><!-- .entry-header -->
 
-    <?php echo get_the_post_thumbnail( $post_id, 'large' ); ?> 
+     <?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?> 
     
 	<div class="entry-content">
 
diff --git a/content.php b/content.php
index 459cb44..f45242f 100644
--- a/content.php
+++ b/content.php
@@ -20,7 +20,7 @@
         
 	</header><!-- .entry-header -->
 
-    <?php echo get_the_post_thumbnail( $post_id, 'large' ); ?> 
+       <?php echo get_the_post_thumbnail( $post->ID, 'large' ); ?> 
     
 		<div class="entry-content">
 
diff --git a/css/theme.css b/css/theme.css
index b675ea4..bd1f268 100644
--- a/css/theme.css
+++ b/css/theme.css
@@ -5879,7 +5879,7 @@ button.close {
 .entry-footer span {
   padding-right: 10px; }
 
-img.wp-post-image, article img {
+img.wp-post-image, article img, figure {
   max-width: 100%; }
 
 a.skip-link {
diff --git a/css/theme.min.css b/css/theme.min.css
index 5c48d1d..a52c506 100644
--- a/css/theme.min.css
+++ b/css/theme.min.css
@@ -1455,7 +1455,7 @@ td.visible-print,th.visible-print{display:table-cell!important}
 #wrapper-hero,#wrapper-static-hero{padding:0!important}
 .wrapper#wrapper-sticky{border-bottom:1px solid #eee}
 .entry-footer span{padding-right:10px}
-article img,img.wp-post-image{max-width:100%}
+article img,figure,img.wp-post-image{max-width:100%}
 a.skip-link{z-index:1000;margin-bottom:-20px;display:block}
 .fa,.fa-stack{display:inline-block}
 /*!
diff --git a/gulpfile.js b/gulpfile.js
index 695894f..f2b22fa 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -48,7 +48,11 @@ gulp.task('cleancss', function() {
 gulp.task('copy-assets', function() {
     gulp.src(basePaths.bower + 'bootstrap-sass/assets/javascripts/*.js')
        .pipe(gulp.dest('./js'));
+<<<<<<< HEAD
+    gulp.src(basePaths.bower + 'bootstrap-sass/assets/stylesheets/*.scss')
+=======
     gulp.src(basePaths.bower + 'bootstrap-sass/assets/stylesheets/**/*.scss')
+>>>>>>> master
        .pipe(gulp.dest('./sass/bootstrap-sass'));
     gulp.src(basePaths.bower + 'bootstrap-sass/assets/fonts/bootstrap/*.{ttf,woff,woff2,eof,svg}')
         .pipe(gulp.dest('./fonts'));
diff --git a/inc/setup.php b/inc/setup.php
index 49b5228..622c570 100644
--- a/inc/setup.php
+++ b/inc/setup.php
@@ -92,10 +92,9 @@ function custom_excerpt_more( $more ) {
 add_filter( 'excerpt_more', 'custom_excerpt_more' );
 
 /* Adds a custom read more link to all excerpts, manually or automatically generated */
-add_theme_support( 'post-thumbnails' );
 
 function all_excerpts_get_more_link($post_excerpt) {
 
-    return $post_excerpt . ' [...]<p><a class="btn btn-default understrap-read-more-link" href="'. get_permalink($post) . '">' . __('Read More...', 'understrap')  . '</a></p>';
+    return $post_excerpt . ' [...]<p><a class="btn btn-default understrap-read-more-link" href="'. get_permalink( get_the_ID() ) . '">' . __('Read More...', 'understrap')  . '</a></p>';
 }
 add_filter('wp_trim_excerpt', 'all_excerpts_get_more_link');
diff --git a/sass/understrap/understrap.scss b/sass/understrap/understrap.scss
index 5c32918..415dfbc 100644
--- a/sass/understrap/understrap.scss
+++ b/sass/understrap/understrap.scss
@@ -28,7 +28,7 @@ font-size:inherit;
 .entry-footer span {padding-right:10px;}
 
 //Limit featured image size to 100%
-img.wp-post-image, article img {
+img.wp-post-image, article img, figure {
 	max-width: 100%;
 }