remove extra, unusued MiddleAgesAssembly instance
Add .gitattributes

Attempt to handle .pbxproj merge conflicts by including both sides of the changes.