Removing conflict marks
Merge branch 'master' of https://github.com/JConwayAWT/PGSS14CC