Trying to make and learn conflicts.
Is this conflict over?
Conflict 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	SimulaceOS/src/shell/Shell.java