change git ignore
Merge branch 'develop' into Allen_Branch