rom
Merge branch 'master' of https://github.com/yate/6502-emulator.git

Conflicts:
	src/emulator.c