Configuring what files are tracked
Merge
Merge branch 'master' of github.com:dgoldfarble/401

Conflicts:
	sim_src/obj_dir/VMIPS_MIPS.cpp
	sim_src/obj_dir/VMIPS__ALL.a
	sim_src/obj_dir/VMIPS__verFiles.dat
More files ignored. Next: add debug info to ROB queue: show finished bit, branch bit, etc.