Hopefully this one works. I pull before I started to work on this again then made the fixes.

The only place I commented out before was images but after fetching I added in my own images added my own folders for contact and vision images. It keeps wanting to delete them if I try to merge at the end of making changes.

-Charles