sync
sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	sass/_base.scss
	sass/_partials.scss
	sass/_parts.scss
	sass/_plugins.scss
	sass/base/_color.scss
	sass/base/_font.scss
	sass/base/_layout.scss
	sass/base/_main.scss
	sass/base/_skeleton.scss
	sass/base/_solarized.scss
	sass/base/_theme.scss
	sass/base/_typography.scss
	sass/base/_utilities.scss
	sass/custom/_color.scss
	sass/custom/_colors.scss
	sass/custom/_fonts.scss
	sass/custom/_layout.scss
	sass/custom/_styles.scss
	sass/partials/_archive.scss
	sass/partials/_blog.scss
	sass/partials/_footer.scss
	sass/partials/_header.scss
	sass/partials/_navigation.scss
	sass/partials/_sharing.scss
	sass/partials/_sidebar.scss
	sass/partials/_syntax.scss
	sass/partials/sidebar/_base.scss
	sass/partials/sidebar/_delicious.scss
	sass/partials/sidebar/_googleplus.scss
	sass/partials/sidebar/_pinboard.scss
	sass/partials/sidebar/_twitter.scss
	sass/parts/_archive.scss
	sass/parts/_article.scss
	sass/parts/_comment.scss
	sass/parts/_footer.scss
	sass/parts/_header.scss
	sass/parts/_index.scss
	sass/parts/_post.scss
	sass/parts/_syntax.scss
	sass/parts/_twitter.scss
	sass/plugins/_fancybox.scss
	sass/plugins/_fancybox_fix.scss
	sass/plugins/_flickr.scss
	sass/plugins/_plugins.scss
	sass/screen.css
	sass/screen.scss
	source/_includes/after_footer.html
	source/_includes/archive_post.html
	source/_includes/article.html
	source/_includes/asides/about.html
	source/_includes/asides/category_list.html
	source/_includes/asides/delicious.html
	source/_includes/asides/github.html
	source/_includes/asides/googleplus.html
	source/_includes/asides/pinboard.html
	source/_includes/asides/recent_posts.html
	source/_includes/asides/twitter.html
	source/_includes/banner.html
	source/_includes/custom/after_footer.html
	source/_includes/custom/archive_post.html
	source/_includes/custom/asides/about.html
	source/_includes/custom/category_feed.xml
	source/_includes/custom/fancybox_head.html
	source/_includes/custom/footer.html
	source/_includes/custom/head.html
	source/_includes/custom/header.html
	source/_includes/custom/navigation.html
	source/_includes/disqus.html
	source/_includes/facebook.html
	source/_includes/facebook_like.html
	source/_includes/fancybox.html
	source/_includes/footer.html
	source/_includes/google_analytics.html
	source/_includes/google_plus_one.html
	source/_includes/head.html
	source/_includes/header.html
	source/_includes/juvia.html
	source/_includes/navigation.html
	source/_includes/post/author.html
	source/_includes/post/categories.html
	source/_includes/post/date.html
	source/_includes/post/disqus_thread.html
	source/_includes/post/juvia_thread.html
	source/_includes/post/sharing.html
	source/_includes/social/facebook.html
	source/_includes/social/google-plus.html
	source/_includes/social/twitter.html
	source/_includes/twitter_sharing.html
	source/_includes/twittersharing.html
	source/_layouts/category_index.html
	source/_layouts/default.html
	source/_layouts/page.html
	source/_layouts/pages.html
	source/_layouts/post.html
	source/_posts/2013-10-19-lorem-ipsum.markdown
	source/about/index.md
	source/archives/index.html
	source/assets/jwplayer/glow/controlbar/background.png
	source/assets/jwplayer/glow/controlbar/blankButton.png
	source/assets/jwplayer/glow/controlbar/divider.png
	source/assets/jwplayer/glow/controlbar/fullscreenButton.png
	source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png
	source/assets/jwplayer/glow/controlbar/muteButton.png
	source/assets/jwplayer/glow/controlbar/muteButtonOver.png
	source/assets/jwplayer/glow/controlbar/normalscreenButton.png
	source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png
	source/assets/jwplayer/glow/controlbar/pauseButton.png
	source/assets/jwplayer/glow/controlbar/pauseButtonOver.png
	source/assets/jwplayer/glow/controlbar/playButton.png
	source/assets/jwplayer/glow/controlbar/playButtonOver.png
	source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png
	source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png
	source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png
	source/assets/jwplayer/glow/controlbar/timeSliderProgress.png
	source/assets/jwplayer/glow/controlbar/timeSliderRail.png
	source/assets/jwplayer/glow/controlbar/unmuteButton.png
	source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png
	source/assets/jwplayer/glow/display/background.png
	source/assets/jwplayer/glow/display/bufferIcon.png
	source/assets/jwplayer/glow/display/muteIcon.png
	source/assets/jwplayer/glow/display/playIcon.png
	source/assets/jwplayer/glow/dock/button.png
	source/assets/jwplayer/glow/glow.xml
	source/assets/jwplayer/glow/playlist/item.png
	source/assets/jwplayer/glow/playlist/itemOver.png
	source/assets/jwplayer/glow/playlist/sliderCapBottom.png
	source/assets/jwplayer/glow/playlist/sliderCapTop.png
	source/assets/jwplayer/glow/playlist/sliderRail.png
	source/assets/jwplayer/glow/playlist/sliderThumb.png
	source/assets/jwplayer/glow/sharing/embedIcon.png
	source/assets/jwplayer/glow/sharing/embedScreen.png
	source/assets/jwplayer/glow/sharing/shareIcon.png
	source/assets/jwplayer/glow/sharing/shareScreen.png
	source/assets/jwplayer/player.swf
	source/atom.xml
	source/blog/archives/index.html
	source/favicon.ico
	source/favicon.png
	source/images/about.jpg
	source/images/bird_32_gray.png
	source/images/bird_32_gray_fail.png
	source/images/code_bg.png
	source/images/dotted-border.png
	source/images/dp.jpg
	source/images/email.png
	source/images/fancybox/blank.gif
	source/images/fancybox/fancybox_loading.gif
	source/images/fancybox/fancybox_sprite.png
	source/images/line-tile.png
	source/images/loading_gray.gif
	source/images/loading_pacman.gif
	source/images/noise.png
	source/images/rss.png
	source/images/search.png
	source/images/social/coderwall.png
	source/images/social/delicious.png
	source/images/social/facebook.png
	source/images/social/flickr.png
	source/images/social/github.png
	source/images/social/google.png
	source/images/social/linkedin.png
	source/images/social/pinboard.png
	source/images/social/pinterest.png
	source/images/social/rss.png
	source/images/social/twitter.png
	source/index.html
	source/javascripts/ender.js
	source/javascripts/github.js
	source/javascripts/hyphenator.js
	source/javascripts/jquery.fancybox.pack.js
	source/javascripts/libs/ender.js
	source/javascripts/libs/jXHR.js
	source/javascripts/libs/jquery.min.js
	source/javascripts/libs/swfobject-dynamic.js
	source/javascripts/modernizr-2.0.js
	source/javascripts/octopress.js
	source/javascripts/pinboard.js
	source/javascripts/slash.js
	source/javascripts/twitter.js
	source/robots.txt
	source/stylesheets/font-awesome-ie7.css
	source/stylesheets/font-awesome.css
	source/stylesheets/style.css
	source/stylesheets/widescreen.css