fixing conflicts
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into c1_zoheiry_continue_playing
[Issue #85] [WIP] updates developer model
[Issue #85] [WIP] modifies new action in developers controller
[WIP][making gamer able to play after voting on all words, and he doesnt get to vote anymore until new words arrive]
[Issue #85] [WIP] modifies new action in developer controller and changes route for new developer
[Issue #85] [WIP] modifies documentation for new action in developers controller
[Issue #85] [WIP] modiies code to match code conventions in new action in developers controller
[Issue #85] [WIP] removes validation check from new action and modifies view of choosing subscription model
[Issue #85] [WIP] modifies route for new action in developers controller
[Issue #85] [WIP] adds developer.save to new action in developers controller
[Issue #85] [WIP] removes extra end in new action in developers controller
[Issue #166][WIP][added Docs]
[Issue #85] [WIP] changes route for action new in developer_controller
[Issue #85] [WIP] adds model and controller tests
[Issue #85] [WIP] modifies UML
Setting up jasmine tests directories
[issue #166][Done][adding tests]
[#issue 166][Done][adding sequence diagram]
[issue #166][FC][Fixing conflicts]