Resolving merge conflict on 3bd4f7a
Added regression file for iPoker FPP