Merge remote-tracking branch 'origin/master'

Conflicts:
	Assignments/daniel_helfrich_assignment9.java