Andrew mucking about in top level
Merge branch 'master' of https://github.com/jfluth/porcupineApple

Conflicts:
	hdl/nexys4fpga.v