changed main
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestProject/src/main/java/com/testproject/App.java