Added test for divide by zero.
Added create-Conflict method
Added two new files for fizBuzz kata
Merge branch 'master' of https://github.com/VivekTestOrganization/TestRepository
Fixed compilation issue.
Added TestFile for branch 1.1
Merge remote-tracking branch 'origin/1.1' into 1.1
Added TestFile for branch 1.1
Merge remote-tracking branch 'origin/1.1'
Merge branch '1.1' of https://github.com/VivekTestOrganization/TestRepository into 1.1
Test
Merge remote-tracking branch 'origin/master' into 1.1
Removed comment on created class
Created 1.2 branch to create conflict while merge
Merge branch '1.2' into 1.1

Conflicts: Resolved
	testorg.trial/src/main/java/com/vivek/App.java