test commit
Merge origin/master

Conflicts:
	src/test/NewClass.java
ioi