Fix ..
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/cse110/com/goldencash/CustomerMainActivity.java