test
Merge branch 'master' of
https://github.com/catalinnovac/doctors.prescription.technology

Conflicts:
	assets/www/conectare.html
Synced