edit git ignore file
Merge branch 'master' into full_title