update penjualan
Merge origin/master

Conflicts:
	aplikasi-pos/src/main/java/com/muhardin/endy/training/pos/demo/ProdukDemo.java
	aplikasi-pos/src/main/sql/skema-oracle.sql
Merge origin/master