no message
Merge branch 'master' of https://github.com/blasv/DineOn into UserSideRequest

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/UserInfo.java
Merge branch 'master' of https://github.com/blasv/DineOn into UserSideRequest

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/UserSatellite.java
Merge pull request #110 from jordanmcnea22/UserSideRequest

User side request
Merge remote-tracking branch 'upstream/master'
Stuffs