Fixed merge error

Branch off your code before editing please.

Changes:
MainJFrame design done.
CustomerJFrame started.
BackEndMain edited.