Changed Login and Shop
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	RetailSystem/src/gui/Shop.java
Merge remote-tracking branch 'origin/master'