First pass at texture atlas
Texture Atlases Completed
Resolved some conflicts.