test4
Merge branch 'master' of https://github.com/NBVA/VAProject.git

Conflicts:
	bin/test/Test.class
	src/test/Test.java