COmmit
Merge remote-tracking branch 'origin/master'

Conflicts:
	part2/src/DisSim.java
	part2/src/resSt.java
	part2/src/rsEntry.java
idk
Revert "idk"

This reverts commit d5bf7147d32abe7315621ac425d13d23c691a428.