Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/po/ReceiptPO.java

POs

Strategy Already Made(except for Give)