boostrap makeover la inceput
adaugat bootstrap cu datepicker care nu merge
pacientii au scope pentru ca modific scoaterea din evidenta
poti vedea deasupra tabelului detalii ale pacientului
informatii de pacient in index
imi trebuie un motiv de iesire pentru pacienti
scoate pacientii din evidenta cu motiv si data
refac pacients index FARA bootstrap
idee despre drug
inca lucrez la prescriere de retete
inca lucrez la cascade de medicament
merge cascade dupa nume, brand, concentratie
pacientii au iesire, am datepicker si reglat imports de jquery
abandonez reteta si urmeaza sa refac evaluarea
eroarea era de la float, cu morris merge fara include
am trecut la morris, imi lasa un tr aiurea in evaluare dupa ce inchid
graficu
mici modificari
Merge branch 'newbranch'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/evaluares.js.coffee
	app/assets/javascripts/reteta.js.coffee
	app/assets/stylesheets/application.css
	app/models/.retetum.rb.swp
	app/models/pacient.rb
	app/views/drugs/_concentration_fields.html.erb
	app/views/drugs/_form.html.erb
	app/views/drugs/show.html.erb
	app/views/pacients/_form.html.erb
	app/views/pacients/_pacients.html.erb
	app/views/pacients/index.html.erb
	app/views/pacients/show.js.erb
	app/views/reteta/_drug_fields.html.erb
	app/views/reteta/_form.html.erb
	config/routes.rb
	db/schema.rb
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js
	public/assets/application.js.gz
	public/assets/manifest.yml