Merge branch 'master' of https://github.com/tomkadwill/tomkadwill.github.io

Conflicts:
	atom.xml
	blog/2013/01/24/my-first-open-source-commit/index.html
	blog/categories/ajax/atom.xml
	blog/categories/beginner/atom.xml
	blog/categories/beginners-guide/atom.xml
	blog/categories/c/atom.xml
	blog/categories/ex17/atom.xml
	blog/categories/gnome/atom.xml
	blog/categories/heap/atom.xml
	blog/categories/javascript/atom.xml
	blog/categories/jquery/atom.xml
	blog/categories/learn-c-the-hard-way/atom.xml
	blog/categories/metaprogramming/atom.xml
	blog/categories/oo/atom.xml
	blog/categories/open-source/atom.xml
	blog/categories/php/atom.xml
	blog/categories/practical-object-oriented-design-in-ruby/atom.xml
	blog/categories/python/atom.xml
	blog/categories/rails/atom.xml
	blog/categories/ruby/atom.xml
	blog/categories/sandi-metz/atom.xml
	blog/categories/stack/atom.xml
	blog/categories/structs/atom.xml
	index.html
	sitemap.xml
	stylesheets/screen.css