Test
fixed another merge conflict
implemented check box search functionality
Added a button.  Woohoo
Test
fixed another merge conflict
implemented check box search functionality
Merge branch 'jenny'