Create 2014-03-04-test-post.md
renamed site
changed baseurl
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

mergin upstream and local