cleanup for pulling from most recent changes
up to date
Merge branch 'master' of github.com:dhalden/Programs
Merge branch 'master' of github.com:dhalden/Programs
commit for merge/pull
Merge branch 'master' of github.com:dhalden/Programs

Conflicts:
	assignments/cs318/lab_2/ISA_Processor/ISA_Processor.gise
	assignments/cs318/lab_2/ISA_Processor/TopLevel_summary.html
	assignments/cs318/lab_2/ISA_Processor/TopLevel_tb_isim_beh.wdb
	assignments/cs318/lab_2/ISA_Processor/_xmsgs/pn_parser.xmsgs
	assignments/cs318/lab_2/ISA_Processor/fuse.log
	assignments/cs318/lab_2/ISA_Processor/fuse.xmsgs
	assignments/cs318/lab_2/ISA_Processor/iseconfig/ISA_Processor.projectmgr
	assignments/cs318/lab_2/ISA_Processor/iseconfig/TopLevel.xreport
	assignments/cs318/lab_2/ISA_Processor/isim.log
	assignments/cs318/lab_2/ISA_Processor/isim/InstROM_isim_beh.exe.sim/ISimEngine-DesignHierarchy.dbg
	assignments/cs318/lab_2/ISA_Processor/isim/InstROM_isim_beh.exe.sim/InstROM_isim_beh.exe
	assignments/cs318/lab_2/ISA_Processor/isim/InstROM_isim_beh.exe.sim/isimkernel.log
	assignments/cs318/lab_2/ISA_Processor/isim/InstROM_isim_beh.exe.sim/work/m_03484898299460613440_1817270755.c
	assignments/cs318/lab_2/ISA_Processor/isim/InstROM_isim_beh.exe.sim/work/m_03484898299460613440_1817270755.didat
	assignments/cs318/lab_2/ISA_Processor/isim/InstROM_isim_beh.exe.sim/work/m_03484898299460613440_1817270755.lin64.o
	assignments/cs318/lab_2/ISA_Processor/isim/InstROM_isim_beh.exe.sim/work/m_16541823861846354283_2073120511.didat
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/ISimEngine-DesignHierarchy.dbg
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/TopLevel_tb_isim_beh.exe
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/isimkernel.log
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/tmp_save/_1
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/TopLevel_tb_isim_beh.exe_main.lin64.o
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_03484898299460613440_1817270755.didat
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_03484898299460613440_1817270755.lin64.o
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_04544521582776293586_0886308060.didat
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_05108143443723865430_4007889531.lin64.o
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_07680790131812828199_3915170638.didat
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_07680790131812828199_3915170638.lin64.o
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_11211262394552056272_2352116331.didat
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_12120086073075627185_3082083525.didat
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_12221351626149339226_3866583278.didat
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_12221351626149339226_3866583278.lin64.o
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_12724444114298492279_2058220583.didat
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_12724444114298492279_2058220583.lin64.o
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_14696055914231528139_3915170638.c
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_14883908363137042711_4007889531.didat
	assignments/cs318/lab_2/ISA_Processor/isim/TopLevel_tb_isim_beh.exe.sim/work/m_16541823861846354283_2073120511.didat
	assignments/cs318/lab_2/ISA_Processor/isim/isim_usage_statistics.html
	assignments/cs318/lab_2/ISA_Processor/isim/temp/@a@l@u.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/temp/@control.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/temp/@data@r@a@m.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/temp/@i@f.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/temp/@inst@r@o@m.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/temp/@top@level.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/temp/@top@level_tb.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/temp/glbl.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/temp/reg_file.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/work/@a@l@u.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/work/@control.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/work/@data@r@a@m.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/work/@i@f.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/work/@inst@r@o@m.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/work/@top@level.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/work/@top@level_tb.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/work/glbl.sdb
	assignments/cs318/lab_2/ISA_Processor/isim/work/reg_file.sdb
	assignments/cs318/lab_2/InstROM.v
post cache lab