fixed wrong info
Merge branch 'master' of github.com:failshell/blog.theroux.ca

Conflicts:
	_site/sitemap.xml
fixed wrong info in mysql post