Updated ServerRequest class
Don't know what changed here
Merge branch 'master' of https://github.com/blchang/splist.git

Conflicts:
	src/edu/berkeley/cs160/theccertservice/splist/FeedActivity.java