Added create-Conflict method
Added two new files for fizBuzz kata
Merge branch 'master' of https://github.com/VivekTestOrganization/TestRepository
Fixed compilation issue.
Merge remote-tracking branch 'origin/1.1' into 1.1