imported lab3
finished 1.2
completed section 2
added adapter, options menu, context menu
fixed filter using 2 joke lists
finished lab 3; ready to merge to master