Merge branch 'hotfix-keep-queue' into test_caset1
Removed extra test that shouldn't have been committed
Got everything to compile, time to test it
Added documentation
Merge branch 'fair-lock' into test-fair-lock
Looks like everything works
Removed old test case
Merge branch 'hotfix-3'