i = 7. End of discussion.
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	SwingProj/src/LarsClass.java