added second line
added second line
Merge branch 'master' of https://github.com/uhoogma/Test

Conflicts:
	src/A.java