asdasd
Merge branch 'master' of https://github.com/kherwei-acceval/Test1.git

Conflicts:
	src/com/acceval/test/TestClass.java