added the urls #91
added the views #91
imported my js file in base
added my html file #91
added my html file requred for ajax #91
added my other file required for ajax #91
added my ajax file #91
resolving conflicts
resolving confilcts
added modified views #91
the last commit before resolving conflicts sat #91
removed the filter method from advanced search #91
resolving conflicts
added final work #91
Merge pull request #168 from DinaSaad/C3_hammad_sprint1

C3 hammad sprint1