real-time sale  DONE!!!
add loyalty card DONE!!!
GGGGGGGGGGGGreat!
Merge remote-tracking branch 'origin/master'
View Staff Complete
Managers see staff
Ceo sees Managers
Confirm Password in Register
Staff Options UI/JSP
Part of Staff Update
Does not change database yet
real-time sale and add loyalty card.
Merge remote-tracking branch 'origin/master'
customer
Staff Update Complete
Merge remote-tracking branch 'origin/master' into NaturalDisasters

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml