merged the .gitignore from master to flexpath