ay7aga
testing

nch 'migrations' into C3_S17_As_a_child_I_can_show_an_event_page

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
ed
adding files
fix conf
updating the branchMerge branch 'C3_S17_As_a_child_I_can_show_an_event_page' of https://github.com/yousraHazem/Topsoft-14 into C3_S17_As_a_child_I_can_show_an_event_page
changes
fixing events
fixing code rev.
fixing code issues
trying
Merge branch 'development' into C3_S1_View_Events_From_Calendar

Conflicts:
	.DS_Store
	kidzen/.DS_Store
	kidzen/app/.DS_Store
	kidzen/app/controllers/calendar_controller.rb
	kidzen/app/models/event.rb
	kidzen/app/views/calendar/show.html.erb
	kidzen/app/views/children/show.html.erb
	kidzen/app/views/layouts/application.html.erb
	kidzen/config/application.rb
	kidzen/config/routes.rb
	kidzen/db/schema.rb
	kidzen/lib/calendar.rb
editing stuff
final fix
Merge pull request #244 from yousraHazem/C3_S1_View_Events_From_Calendar

C3 s1 view events from calendar 2nd