password for db
Merge branch 'master' of https://github.com/sudhirsb2003/pharmareport

Conflicts:
	config/database.yml
small fix
select box and some jquery
Merge branch 'master' of https://github.com/rshiva/pharmareport

Conflicts:
	app/controllers/appointments_controller.rb
	app/controllers/reports_controller.rb