Merge remote-tracking branch 'origin/master'

Conflicts:
	src/pset08/p1/MatchReader.java
	src/pset08/p1/SearchLines.java
	src/pset08/p1/command.txt
	src/pset08/p3/PersistentArray.java
	src/pset08/p3/PersistentArrayTest.java