Merge branch 'Active-Record-DB' of https://github.com/matiasmelendi/Llamadas into Active-Record-DB

Conflicts:
	lib/db/compania_db.rb