Merging changes in master into my working branch.
I have no idea why we didn't have 'Asset Serialization' set to ForceText...? I've set it that way now, but it seems we've wasted a lot of space on pushing binaries...
I have no idea why we were serializing our assets as mixed instead of forced text? Doesn't that mean we've pushed a ton of unnecessary and un-trackable binary files? I've been serializing them as forced text, and I realized I want to make sure that's pushed as well in case I change something and we have no idea how to resolve the merge conflict!