look the errors.txt
Merge branch 'master' of https://github.com/JohnBelly95/PcParts

Conflicts:
	Sell.class
	TextReader.class
	mainApp.class