s01-us02: created new branch for the user story nr. 2
s01-s02: commit before merging with the DB branch
Merge remote-tracking branch 'origin/s01-us33' into s01-us02
s01-us02: implemented a basic search, I have not tested because my
emulator still won't work
s01-us02: fixed some bugs
Merge remote-tracking branch 'origin/s01-us02' into Development

Conflicts:
	gen/com/example/yinyangapp/R.java