some things
testing
testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	Cognition/main_cognition.py
	Cognition/spacial_cognition.py
	htm/cla_column.py
	htm/cla_dendrite.py
	htm/cla_region.py
	test_raum.py