#2 this is somewhat cool code

已合并

wesvirus 于 4 年之前将 2 次代码提交从 kyle/master合并至 wesvirus/master

作者	SHA1 备注	提交日期
Your Name	9777702972 forgot this too	4 年之前
Your Name	e08a7aa0e7 some important changes, also some not-so-important ones too	4 年之前