rebasing from master cause john said so
everyone's watching me!
meassasda
Worked on CashInsertion;rem line in display
Merge remote-tracking branch 'origin/master' into matt

Conflicts:
	src/master/Main.java
Added all buttons for insertCash