Add branch
Merge branch 'master' of https://github.com/vmohan7/Arimaa into vmnz-features
Merge branch 'master' of https://github.com/vmohan7/Arimaa into vmnz-features
Add stub for trap status
Merge branch 'master' of https://github.com/vmohan7/Arimaa into vmnz-features

Conflicts:
	ArimaaBot/src/naive_bayes/FeatureExtractor.java
Merge branch 'master' of https://github.com/vmohan7/Arimaa into vmnz-features
in process of updating TrapExtractor
Merge branch 'master' of https://github.com/vmohan7/Arimaa into vmnz-features

Conflicts:
	ArimaaBot/src/feature_extractor/FeatureExtractor.java
'Finished' TrapExtractor--tested elephant and bit status, need to test updating the bitset
Stash
Merge branch 'master' of https://github.com/vmohan7/Arimaa into vmnz-features

Conflicts:
	ArimaaBot/src/feature_extractor/FeatureExtractor.java
Added our tests to the feature extractor test class (removed from FeatureExtractor)
updated comments and added constants to FeatureConstants for PositionMovementExtractor
no changes.
Merge branch 'master' of https://github.com/vmohan7/Arimaa into vmnz-features