search
Merge branch 'master' of
https://github.com/edenlin18/StudyGroupFinder.git

Conflicts:
	gen/com/ucsd/studygroupfinder/R.java