fix .gitignor
Merge branch 'hehe'
Merge branch 'master' into hehe