my commut lols
Merge remote-tracking branch 'origin/master'

Conflicts:
	ADVPROG/src/com/computerstore/CPU.java
	ADVPROG/src/com/computerstore/Keyboard.java
	ADVPROG/src/com/computerstore/Monitor.java
	ADVPROG/src/com/computerstore/Mouse.java
	ADVPROG/src/com/computerstore/OS.java