two balls & (may bugs) bar
Merge branch 'master' of https://github.com/nblintao/SoC

Conflicts:
	SoC/top.bit
	code/inst_mem_v.v
	code/mio_bus.v
	code/mips_code/ball.asm