add main method
Merge branch 'yannisbranch'

Conflicts:
	project-folder/src/testproject/Test.java