Cleaned stuff up
Merge branch 'master' of https://github.com/JConwayAWT/PGSS14CC
Metalics fixes
Fixed merge