modified:   _config.yml
	new file:   _posts/2013-04-03-test-test.md
Merge branch 'master' of github.com:lamperwang/lamperwang.github.com

Conflicts:
	_config.yml