b
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	GitTest/src/Main.java
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	GitTest/src/Main.java
sdd
Merge branch 'master' into new
deasd
Merge remote-tracking branch 'choose_remote_name/master' into pull

Conflicts:
	GitTest/src/Main.java
Merge branch 'pull'

Conflicts:
	GitTest/src/Main.java