added second line
Merge branch 'master' of https://github.com/mkalmo/project1.git

Conflicts:
	src/A.java