changed gitignore
Revert "changed gitignore"

This reverts commit 3c1545a2c9ee9f7cbc5d3d6c21b0d576300f4e44.
Merge branch 'aaron_mac' of https://github.com/aefreedman/Field1 into max
added player triangle and damping ring needs adjusting
Merge branch 'max' of https://github.com/aefreedman/Field1 into shervin
Added player arrow directional aid