Conway and Fredkin Tests
Merge branch 'floyddj'