done!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/HW3.java
done!
Merge remote-tracking branch 'origin/master'