asd
Merge branch 'master' of https://github.com/kala-gx/Git_Test.git

Conflicts:
	Test/src/test/Main.java
ss