edit
Merge branch 'gh-pages' of https://github.com/3DIC/news2013 into gh-pages