Merge branch 'master' into Nima-Ghods
update ignore

ignore only works for temp.
Merge branch 'Nima-Ghods'