Ressurected the requirement of having a newline at the end of each file (makes merges much simpler)
Fixed a bug with Baron Rivendare,

Also added a system to keep track of how many times a player's board contains a particular effect.