changed gitignore
Revert "changed gitignore"

This reverts commit 3c1545a2c9ee9f7cbc5d3d6c21b0d576300f4e44.
Merge branch 'aaron_mac' of https://github.com/aefreedman/Field1 into max
Update .gitignore
Update .gitignore
Removing uneeded vs proj files
added player triangle and damping ring needs adjusting
Update .gitignore
Merge branch 'shervin' of https://github.com/aefreedman/Field1 into shervin
Update .gitignore
Update .gitignore
Update .gitignore
Removed file that shouldn't be tracked
Merge branch 'shervin' of https://github.com/aefreedman/Field1 into shervin
Merge branch 'max' of https://github.com/aefreedman/Field1 into shervin
Added basic circle obstacle; building out obstacle system
Color changes; updates to variables
Added player arrow directional aid
Merge commit 'fb004259760924823c16313961ee79fb1af1c622' into dev

Conflicts:
	src/Player.cpp
Art and stuff