More changes

- Added Famicom Cartridge
Resolve mege conflicts