saving an update to the user
Merge branch 'master' of https://github.com/jcono/timeline

Conflicts:
	backend.rb
	spec/requests/patient_api_spec.rb