new file:   CNAME
	new file:   _config.yml
	new file:   _layouts/default.html
	new file:   _posts/2013-04-7-hello-world.md
	new file:   index.html
Rename CNAME to test
Merge branch 'master' of https://github.com/imwyvern/imwyvern.github.io into gh-pages

Conflicts:
	_config.yml
	index.html