Scan Barcode aman
Merge branch 'master' of https://github.com/novitanata/Simpeda_V01

Conflicts:
	SIMPEDA_V01/SIMPEDA_V01.v11.suo
	SIMPEDA_V01/SIMPEDA_V01/Controllers/HomeController.cs
	SIMPEDA_V01/SIMPEDA_V01/Controllers/TransaksiController.cs
	SIMPEDA_V01/SIMPEDA_V01/Views/Transaksi/Details.cshtml
	SIMPEDA_V01/SIMPEDA_V01/bin/SIMPEDA_V01.dll
	SIMPEDA_V01/SIMPEDA_V01/bin/SIMPEDA_V01.pdb
	SIMPEDA_V01/SIMPEDA_V01/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SIMPEDA_V01/SIMPEDA_V01/obj/Debug/SIMPEDA_V01.csproj.FileListAbsolute.txt
	SIMPEDA_V01/SIMPEDA_V01/obj/Debug/SIMPEDA_V01.csprojResolveAssemblyReference.cache
	SIMPEDA_V01/SIMPEDA_V01/obj/Debug/SIMPEDA_V01.dll
	SIMPEDA_V01/SIMPEDA_V01/obj/Debug/SIMPEDA_V01.pdb