edit Test.java again in Eclipse
Merge branch 'master' of https://github.com/v4lkyr13/DEMO.git

Conflicts:
	DEMO/src/test/Test.java
accept edit from github and edit again in local Eclipse