ADD MORE COMMENT
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/cse110/com/goldencash/AppActivity/SigninActivity.java
	app/src/main/java/cse110/com/goldencash/AppActivity/TransactionActivity.java
	app/src/main/java/cse110/com/goldencash/modelUser/User.java