Fix merge conflicts
Fix merge conflicts
Merge branch 'master' of https://github.com/JConwayAWT/PGSS14CC