Remove Alex's duplicate CodePolygons, tsk tsk tsk...
Fix git conflicts with CodePolygons, which ALEX's DID NOT RESOLVE PROPERLYgit add -u