Updated default.html
Updated default.html
Deleted 2013-05-29-your-filename.md
Created 2013-05-29-your-filename.md
Deleted 2013-05-29-your-filename.md
Deleted _posts/2013-03-16-some-test.md
Created _posts
test
Updated _posts
updated default.html
Create blog.html
Create page.html
Merge branch 'master' into gh-pages

Conflicts:
	_layouts/default.html