Commented out some code. Added two files to version control which should
have already been added.
Merge branch 'master' of https://github.com/blchang/splist.git

Conflicts:
	bin/classes/edu/berkeley/cs160/theccertservice/splist/PickUpActivity.class
	
Don't know why this was messing it up... Should be good now.