忽略IDEA项目文件
fix_timeline只提交必要的改变
Merge pull request #1 from WoSai/jinliu

fix_timeline changes