refactorings
Merge branch 'master' into tos-kamiya/refactoring
add personal log feature in goal page
resolve conflict
remove merge lines (<<<, >>>, ===)
Merge pull request #57 from ICTKyouikukei2013/tos-kamiya/personallog

Tos kamiya/personallog