Changes, apparently
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/PaymentManager.java