Updated Instrumentation

Have added a few more pieces to write to file…still working on
formatting
Merge branch 'master' of https://github.com/jb38/cs474-simulation

Conflicts:
	src/main/java/edu/hood/cs/sim/Instrumentation.java
Revert 766c983..1dc5c03

This rolls back to commit 766c9831eeab08361c5f42dce79c3edf0bee8840.