reset HEAD^
Merge branch 'refactor' of github.com:ryysd/OCTAGRAM into refactor