Merge pull request #18 from tassiahmed/working

Added implementations of J in sim.h and sim.c.
ADDI ADDIU, ORI, LUI
Merge branch 'working' of https://github.com/bdrumheller/comporgfinal into bdrumheller-working
Implementation of ADDI, ADDIU, ORI, and LUI
Merge branch 'bdrumheller-working'
ADDI, ADDIU, ORI, LUI
Merge branch 'master' of https://github.com/tassiahmed/comporgfinal

Fixed up conflicts for merging

Conflicts:
	comporg-mips-sim/sim/sim.c
Added all the OP codes for branching instructions
Merge branch 'working' of https://github.com/tassiahmed/comporgfinal into working

Fixing merge issues

Conflicts:
	comporg-mips-sim/sim/sim.h