jj
Merge branch 'master' of https://github.com/riatongit/PCJT-BSD.Final

Conflicts:
	PCJTBSDFinalProject/src/view/invoice/Invoice.java