emergency contact page
Merge branch 'master' of github.com:rickbrunstedt/meditag

Conflicts:
	config/routes.rb
merge files to track
adjusting test syntax for emergency contacts
merge pulled files
Merge branch 'master' of github.com:rickbrunstedt/meditag

Conflicts:
	app/views/layouts/_header.html.erb
Merge branch 'master' of github.com:rickbrunstedt/meditag
Fix merge conflicts
twilio message sending from emergency page
Merge branch 'master' of github.com:rickbrunstedt/meditag
yaml.secrets for twilio
Merge branch 'master' of github.com:rickbrunstedt/meditag