Trying again
Merge branch 'master' of https://github.com/highlanderkev/highlanderkev.github.io

Conflicts:
	README.md
	_includes/aboutme.html
	_includes/contactme.html
	_includes/navigation.html
	_includes/search.html
	_plugins/jekyll_indextank.rb
	_posts/2012-12-02-development-tools.html
	_posts/2013-04-09-http-headers.html
	contact.html
	index.html
	posts.html