Test with patients object and js integration
Merge branch 'master' of https://github.com/abuhabuh/healthProj

Conflicts:
	app/views/patients/index.html.erb