Mux 16x4
	modified:   Components/Components.xise
	new file:   Components/Components.xise.orig
	modified:   Components/iseconfig/Components.projectmgr
	new file:   Components/iseconfig/Components.projectmgr.orig
	modified:   Components/iseconfig/Processor.xreport
	new file:   Components/iseconfig/Processor.xreport.orig
	new file:   Components/mux16b2.sch
	modified:   Components/mux16b4.schlog
	modified:   Components/work/Components.gise
	modified:   Components/work/Processor_summary.html
	modified:   Components/work/_xmsgs/pn_parser.xmsgs
	deleted:    Components/work/isim/work/add1b.sdb
	deleted:    Components/work/isim/work/add1b_tb_0.sdb
Merge branch 'master' of https://github.com/Doolan/CSSE232_processor

Conflicts:
	Components/Components.xise