Updated Makefile
Merge branch 'master' of https://github.com/petrockblog/SNESDev-RPi

Conflicts:
	src/Makefile