Resolved merge confilcts

Files added:
- ar.yml
- en.yml
- search controller
- search view
Story C4.S02: Synonym Retrieval

Merge branch 'C4_NourhanMohamed_S02_retrieve_synonyms' into rolling_master

Conflicts:
	arability/app/models/synonym.rb
	arability/config/locales/ar.yml
	arability/config/locales/en.yml
Merge branch 'rolling_master' of https://github.com/MGhanem/smartsoft-13 into rolling_master
[WIP] added nicescroll and work to be changed
stashes work
edited in ar.yml file
[Issue #187][WIP] edited in ar.yml file
Entire Game
pulled rolling master, fixed conflicts
modifying conflicts
Merge branch 'rolling_master' of https://github.com/MGhanem/smartsoft-13 into rolling_master
[isuue #83 spaces modified to follow conventions
fixed routing problems
[WIP] view prizes progress fixed overflow scroll
Merge branch 'rolling_master' of https://github.com/MGhanem/smartsoft-13 into c1_zoheiry_game
fixed routing problem
updating score calculation
Merge branch 'rolling_master' of https://github.com/MGhanem/smartsoft-13 into c1_zoheiry_c1s10_edit
[WIP] fixing view issues and now placing prizes
[Issue #197][WIP] changed gamer and synonym relation and added a new gem to the gem file
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C4_nourhanZ_C4S04_VisualStats