main added-test
dadada
Merge remote-tracking branch 'origin/master'

Conflicts:
	struc/src/Main.java