add line to allgorithm method
Merge branch 'conflictor'

Conflicts:
	SampleWithMergeConflicts/src/main/CS320_A2.java