fixing merge issues
cleaning search
fixing merging
Merge branch 'master' of github.com:franciuipapi/Project2 into search2
Merge branch 'master' of github.com:franciuipapi/Project2 into search2
adding search fields
adding search fields
adding last two fields
fixing merge conflict