Merge branch 'migrations' into C3_S10_create_a_poll_with_a_dynamic_no._of_Questions
Merge branch 'authentication_fix' of https://github.com/yousraHazem/Topsoft-14 into migrations
adding keywords
adding migrations
fixing migrations
Merge branch 'migrations' of https://github.com/yousraHazem/Topsoft-14 into migrations
Merge branch 'migrations' into C3_S10_create_a_poll_with_a_dynamic_no._of_Questions

Conflicts:
	kidzen/config/routes.rb
Merge branch 'C3_S10_create_a_poll_with_a_dynamic_no._of_Questions' of https://github.com/yousraHazem/Topsoft-14 into C3_S10_create_a_poll_with_a_dynamic_no._of_Questions

Conflicts:
	kidzen/config/routes.rb