hello1 my changes
Merge branch 'master' of https://github.com/Chivaldori/test2

Conflicts:
	IdeaProject1/src/Main.java