Merge branch 'master' into HWZ_1.0

Conflicts:
	src/FirstClass.java