修改require文件
Merge remote-tracking branch 'upstream/master'
定义了angryman的简单行为
Merge remote-tracking branch 'upstream/master'