fixing merginfg
add stuff
Merge branch 'sora' of https://github.com/ruinakata/sora into sora
adding stuff