test rdiscount
Merge branch 'master' of https://github.com/jacksparrow01/jacksparrow01.github.io

Conflicts:
	_posts/2013-08-21-iframe-crossdomain-solution.md