push some IF changes
i
Merge branch 'master' of https://github.com/jfluth/porcupineApple

Conflicts:
	hdl/nexys4fpga.v