Added search button
Added Images
Added search function
Updated gui for mainActivity
fix merge conflicts
Merge remote-tracking branch 'origin/master' into checkout