merger
Merge branch 'master' of http://github.com/JConwayAWT/PGSS14CC