[Issue #74][MC] Resolved merge conflicts
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C4_NourhanMohamed_S01_KeywordQuickSearch
[Issue #74][WIP] used rails tags instead of normal html tags
Merge branch 'C4_NourhanMohamed_S01_KeywordQuickSearch' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S11_search_by_category
[Issue #92][WIP] controller and model now accept categories
Merge branch 'project_skeleton' into C4_m0hamed_S11_search_by_category

Conflicts:
	arability/config/routes.rb
[Issue #74][WIP] added UI, updated method names and some minor changes
Merge branch 'C4_NourhanMohamed_S01_KeywordQuickSearch' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S11_search_by_category

Conflicts:
	arability/app/controllers/search_controller.rb
	arability/app/models/keyword.rb
	arability/config/routes.rb
Merge branch 'master' into C4_m0hamed_S11_search_by_category
[Issue #74][WIP] removed a redundant route
[Issue #74][WIP] Resolved sorting the keyword search results by relevance
Merge branch 'project_skeleton' of https://github.com/MGhanem/smartsoft-13 into C4_NourhanMohamed_S01_KeywordQuickSearch
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C4_NourhanMohamed_S01_KeywordQuickSearch
[Issue #74][WIP] deleted some redundant lines in the search method from controller
[Issue #74][WIP] added UML Sequence Diagram for Story C4.S01
Merge branch 'C4_NourhanMohamed_S01_KeywordQuickSearch' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S11_search_by_category

Conflicts:
	arability/app/controllers/search_controller.rb
	arability/app/models/keyword.rb
[Issue #92] Finished except uml
[Issue #74][WIP] updated keyword search sequence diagram
[Issue #74][WIP] solved a bug - eliminated unapproved keywords from search
[Issue #92][Finished] Added sequence diagram to story C4S11