Push and commit
Merge branch 'master' of https://github.com/kamalsofteng/TestingGit.git

Conflicts:
	src/Class1.java