mult sra
fixed conflict
Merge branch 'master' of https://github.com/tassiahmed/comporgfinal
eliminated merge conflict
Conflicts:
	comporg-mips-sim/sim/sim.c
commented testcode
Merge pull request #44 from tassiahmed/working

Working
Merge branch 'master' of https://github.com/tassiahmed/comporgfinal

merge
commented testcode
getting rid of merge conflicts
Merge branch 'working' of https://github.com/bdrumheller/comporgfinal into working

getting rid of conlficts

Conflicts:
	comporg-mips-sim/sim/sim
	comporg-mips-sim/sim/sim.c
	comporg-mips-sim/sim/sim.c~
Merge pull request #43 from bdrumheller/working

test code
Fixed up implementation of elapsed time for output file