Merge pull request #1 from Tablesalt/master

i wanna merge some branches
Merge pull request #2 from Tablesalt/crazy

Merge pull request #1 from Tablesalt/master