Merge pull request #1 from honbin/master

sync base master
Merge pull request #2 from honbin/master

sync base master
Update ohsuka.md
Create golf_nau.md
Update ohsuka.md
Merge branch 'master' of github.com:honbin/summer-camp-2014

Conflicts:
	themes/ohsuka.md
Merge pull request #9 from oh-sky/master

真面目に考えました