Merge branch 'master' of https://github.com/TeamPalmTree/teampalmtree
updated ignores
updated ignores