int 24
i3 25
Added i4
i5
i6
Merge branch 'TestNew'

Conflicts:
	SwingProj/src/LarsClass.java