This is a readme by Edmund Rosewright Note: I am working with Shiro TO DO Next Time Discuss Merge Conflicts