LEEEEENIIIINNN!!! favor leer http://www.reinteractive.net/posts/116-12-tips-for-the-rails-asset-pipeline
Merge branch 'master' of https://github.com/meruba/sisfa
updated read me
updated read me
Merge branch 'master' of https://github.com/meruba/sisfa

Conflicts:
	README.rdoc
annotate
Fixing some bugs in Hospitalizacion
add translation to boolean
Merge branch 'master' of https://github.com/meruba/sisfa into modulo_enfermeria
making hospitalizados and asignacion cama