changes
changes2
Merge branch 'master' of https://github.com/JohnBelly95/PcParts

Conflicts:
	CPU.class
	GPU.class
	HardDrive.class
	Hardware.class
	Keyboard.class
	Motherboard.class
	Mouse.class
	Order.class
	PcParts.class
	Peripherals.class
	Printer.class
	RAM.class
	Screen.class
	Sell.class
	Stock.class
	Test404.class
	TextReader.class
	TextWriter.class
	mainApp.class