Merge commit 'HEAD'; branch 'merge_affinity_with_classes'
tree1f876b0c388bfe7cfa252cda2ee0321ff973fe49
-rw-r--r-- 5 .gitignore
-rw-r--r-- 135 Makefile
-rw-r--r-- 4016 ring.cpp