commit1
Merge branch 'master' of https://github.com/tonypro17/ECE473_Project

Conflicts:
	RegFile.qws
	db/RegFile.db_info
added lots of i and j type instrs