update
Merge branch 'gh-pages' of github-katagiri-pro:2014Camp-pro/docs into gh-pages