Database file update
Merge branch 'master' of https://github.com/Karlos7692/Election_Infograph

Conflicts:
	config/database.yml