del method
Merge origin/master

Conflicts:
	Test/src/test/Test.java