updated config database.yml
commited pull changes
Merge branch 'master' of https://github.com/nupmmarkbegale/stepped_care_reboot
Merge branch 'master' of https://github.com/nupmmarkbegale/stepped_care_reboot
Merge branch 'master' of https://github.com/nupmmarkbegale/stepped_care_reboot
created activity form
updated form
Merge branch 'master' of https://github.com/nupmmarkbegale/stepped_care_reboot
added hours to form
fixed context
merged in changes
Merge branch 'activity_form'
added parameter
updated yml file so others don't have conflict