oops sorry forgot to commit yesterdays change
Merge branch 'gh-pages' of https://github.com/cmd1209/jekyll2 into gh-pages

Conflicts:
	_posts/2014-8-25-Whats-going-on.markdown
try again