3rd change from user 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	marcos-lab1/src/main/ScannerExample.java