detail barang
Merge branch 'master' of
https://github.com/faizilham/IF3110-Tubes-II.git

Conflicts:
	WebContent/WEB-INF/web.xml