ignore gitignore files, that need to be there so the directories stay
Merge branch 'fireteam' into gb_master