Merge branch 'master' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_S8_followWord
[Issue #189] Added test framework
Merge branch 'master' into C4_m0hamed_C5F1_send_mail
issue [#191] [WIP] list and delete trophies
[Issue #189] Added tests
Added Guardfile and rspec to .gitignore
[WIP] more progress towards logic
[WIP] for rewarding gamer with trophies
[WIP] Added untracked file to commit
[WIP] Added gettrophies view to routes
Merge branch 'c1_kareemalirahman_c1s27_selectSynonym' of https://github.com/MGhanem/smartsoft-13 into c1_kareemalirahman_c1s27_selectSynonym

* 'c1_kareemalirahman_c1s27_selectSynonym' of https://github.com/MGhanem/smartsoft-13:
  [issue #169] [WIP] adds select_synonym method
[WIP] pulled game skeleton on branch
[isuue #169] [WIP] adds the front end of selecting synonym in vote form
[issue #169] [WIP] adds backend, however not finished
[WIP] Added getnewtrophies js erb
[WIP] Align right for congrats
[WIP] Renamed getnewtrophies to gettrophies
[Issue #94] Added test framework

Conflicts:
	arability/Gemfile
[WIP] Removed old getnewtrophies js erb file
[Issue #195][WIP] updated yml translation files