jekyll incorporated
rakefile
new configs
some fixes
incorporated
Merge branch 'master' of github.com:kippt/jekyll-incorporated
modified posts
fixes
readme fix
Fixing typo in google analytics script include
Merge pull request #1 from fnavarrov/master

Fixing typo in google analytics script include
ruby version
Merge branch 'master' of ssh://github.com/kippt/jekyll-incorporated
Fixed typo
Fixes mixed content warning on HTTPS sites

Loading google fonts over SSL fixes the mixed content warning.
fixed zoom image, thanks @jorde
no sticky header
Merge pull request #5 from captn3m0/patch-1

Fixes mixed content warning on HTTPS sites
Merge pull request #2 from pborreli/patch-1

Fixed typo
Merge github.com:kippt/jekyll-incorporated

Conflicts:
	.gitignore
	404.html
	Gemfile
	README.md
	_assets/javascripts/main.js
	_assets/stylesheets/_article.scss
	_assets/stylesheets/_base.scss
	_assets/stylesheets/_bootstrap.scss
	_assets/stylesheets/_icons.scss
	_assets/stylesheets/_nav.scss
	_assets/stylesheets/_responsive.scss
	_assets/stylesheets/main.scss
	_config.yml
	_includes/_social.html
	_layouts/base.html
	_layouts/post.html
	favicon.ico
	images/blog-cover.jpg
	images/logo.png
	index.html