Added test taunt menu to F3
Fixed Merge Conflicts (Hopefully)