Removing nesting in sets (old version on nested branch now)
Remove file that must be from a forward branch that shouldn't be here
Merge branch 'load_cardlib' into card_cache