Removed CollisionScoreKeeper.cpp
Merge branch 'aaron_mac' of https://github.com/aefreedman/Field1 into aaron_mac
Merge branch 'max' of https://github.com/aefreedman/Field1 into aaron_mac