Finish user edit
Merge branch 'master' of https://github.com/kaoru17th/topclass