add in git attributes ignore
Merge branch 'master' into allowPullingProfileFromDb
just clean up