6
7
9
Create README.md
printer 2
Merge remote-tracking branch 'origin/master' into master1

Conflicts:
	testProject/src/main/java/Run.java