test commit after repository transfer
Attempt to bring local fork up to date

Adding and deleting files not carried over with commit on numenta/master
initial commit of new branch on cogmission fork with more spatial pooler
development
finished getNeighborsND (not tested yet)
getNeighborsND tested rudimentarily and now needs a unit test more fully
developed.
Temporary test for getNeighborsND added to assure it works, though the
end goal is to duplicate the Python extensive test
remove original column from neighbor list returned
Merge remote-tracking branch 'origin/spatial_pooler_dev'

Conflicts:
	src/org/numenta/nupic/research/SpatialPooler.java
Work to refactor getNeighborsND to make simpler and use blocks as
general utility
Merge branch 'master' into SpatialPooler_Ongoing_Dev
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	src/main/java/org/numenta/nupic/data/ConsecutivePatternMachine.java
	src/main/java/org/numenta/nupic/data/TypeFactory.java
	src/test/java/org/numenta/nupic/data/SparseObjectMatrixTest.java
	src/test/java/org/numenta/nupic/unit/SpatialPoolerTest.java
Merge branch 'master' into SpatialPooler_Ongoing_Dev
syncing
Fixing .gitignore and removing artifacts

Like IDE artifacts and gradle build artifacts.
Added official tests from python version of sp test, also fixed
.gitignore
Merge branch 'master' of github.com:cogmission/copic-j into cogmission-master

Conflicts:
	.gitignore
Merge pull request #1 from rhyolight/cogmission-master

Fixing .gitignore and removing artifacts
Merge pull request #7 from cogmission/master

Added computeColumns and getNeighborsND