03/04/14 changes update
Merge branch 'master' of https://github.com/cpe187/CPE187-S14

Conflicts:
	spibus-verilog/master.v
	spibus-verilog/old spibus.v/spibus_tb.v
	spibus-verilog/spibus_tb.v
	spibus-verilog/top_tb.v
updates from tuesday lec (03/04/14)