add database config to gitignore file
Merge branch 'master' of github.com:arturoblack/audit
Merge branch 'master' of github.com:arturoblack/audit
Merge branch 'master' of github.com:arturoblack/audit
some example change in list View, and starding new branch
vier for Inidicadores
OMerge branch 'master' of github.com:arturoblack/audit
Merge branch 'master' into a_indicadore_frontend
Merge branch 'master' of github.com:arturoblack/audit into a_indicadore_frontend

Conflicts:
	app/assets/javascripts/angular/services/area_service.js
merge master 21/11
beta indicadores issue
Merge branch 'master' of github.com:arturoblack/audit
Merge branch 'master' into a_indicadore_frontend
correccion de errores indicadores
Merge pull request #9 from arturoblack/a_indicadore_frontend

Creation of indicadore