demo cart checkout button finished
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/MainFrame$1.class
	bin/MainFrame$10.class
	bin/MainFrame$11.class
	bin/MainFrame$12.class
	bin/MainFrame$13.class
	bin/MainFrame$14.class
	bin/MainFrame$15.class
	bin/MainFrame$16.class
	bin/MainFrame$17.class
	bin/MainFrame$18.class
	bin/MainFrame$19.class
	bin/MainFrame$2.class
	bin/MainFrame$3.class
	bin/MainFrame$4.class
	bin/MainFrame$5.class
	bin/MainFrame$6.class
	bin/MainFrame$7.class
	bin/MainFrame$8.class
	bin/MainFrame$9.class
	bin/MainFrame.class
	src/MainFrame.java