CipHuK Merge github.com:sxxkun/solochan

Merge yours and me files