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
Added vim .swp files to the gitignore
Merge branch 'project_skeleton' into C4_m0hamed_S11_search_by_category

Conflicts:
	arability/config/routes.rb
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
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 #92][Finished] Added sequence diagram to story C4S11
[Issue #74][MC] resolved merge conflicts with C4.S11 branch, but its UML diagram is also added because git refuses to remove it
[Issue #74][WIP] updated methods documentation and added author info