Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S14_AddWordToDatabase
Merge branch 'project_skeleton' into C4_m0hamed_S14_AddWordToDatabase
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S14_AddWordToDatabase
Merge branch 'project_skeleton' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S14_AddWordToDatabase
[Issue #94][NW] flash messge not displayed on wrong submission
Merge branch 'C4_NourhanMohamed_S01_KeywordQuickSearch' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S14_AddWordToDatabase

Conflicts:
	arability/app/models/keyword.rb
	arability/config/routes.rb
Merge branch 'create_model_category' into C4_m0hamed_S14_AddWordToDatabase
Merge branch 'create_model_category' into C4_m0hamed_S14_AddWordToDatabase
[Issue #94][WIP] Almost final state of the issue

Some of the errors when creating categories automatically with keywords are not
displayed. Also the errors sent from the keywords controller are not working
correctly
Merge branch 'project_skeleton' into C4_m0hamed_S14_AddWordToDatabase
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S14_AddWordToDatabase
[Issue #94][Finished] Added the sequence diagram
[Issue #74][MC] resolved merge conflicts for additional integration between stories C4.S01 and C4.S14
[Issue #74][Finished] integrated add word to database if keyword not found