rebasing from master cause john said so
FU Git
Name changed

Test to fix the Git nonsense
everyone's watching me!
meassasda
Worked on CashInsertion;rem line in display
FU Git
Name changed

Test to fix the Git nonsense
7-21-14 6:24pm
7-22-14 10:51pm CardSwipe Window
7-22-14 10:51pm CardSwipe Window
Merge remote-tracking branch 'origin/master' into matt

Conflicts:
	src/master/Main.java
Added Customer
Added Customer
rebased to add Heath
Added all buttons for insertCash
Added customer
Add customer class/modified Calcs
Fixed typos in Main and CashInsertion
Fixed merge issue