Added rule for Fizz
Added rule for Fizz 2
Resolved merge conflicts in fizzbuzz