Create .gitignore
Merge branch 'gh-pages' into develop

Conflicts:
	.gitignore
OctoPro
Merge branch 'release/Octopress' into gh-pages

Conflicts:
	Rakefile
	_config.yml
	sass/base/_theme.scss
	sass/base/_typography.scss
	sass/custom/_fonts.scss
	sass/custom/_layout.scss
	sass/custom/_styles.scss
	sass/partials/_sidebar.scss
	sass/partials/_syntax.scss
	sass/screen.scss
	source/_includes/article.html
	source/_includes/asides/github.html
	source/_includes/asides/recent_posts.html
	source/_includes/custom/head.html
	source/_includes/custom/header.html
	source/_includes/disqus.html
	source/_includes/facebook_like.html
	source/_includes/head.html
	source/_includes/post/sharing.html
	source/_includes/twitter_sharing.html
	source/_layouts/default.html
	source/images/rss.png
	source/index.html
	source/javascripts/github.js
	source/javascripts/modernizr-2.0.js
	source/javascripts/octopress.js
	source/javascripts/pinboard.js
	source/javascripts/twitter.js