Bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Arduino/MainProject/MainProject.ino
	Arduino/MainProject/ReciveBill.ino