Ventana principal y sus enlaces listos
Merge branch 'master' of https://github.com/pableiros/ControlMonetarioPersonal

Conflicts:
	AgregarIngreso.php
	cartera.html
	css/bootstrap-theme.css
	css/bootstrap-theme.css.map
	css/bootstrap-theme.min.css
	css/bootstrap.css
	css/bootstrap.css.map
	css/bootstrap.min.css
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	js/jquery.min.js
Enlaces y pagina principal lista

- prueba de subida
Merge remote-tracking branch 'origin/master'

Conflicts:
	cartera.html
	css/bootstrap-theme.css
	css/bootstrap-theme.css.map
	css/bootstrap-theme.min.css
	css/bootstrap.css
	css/bootstrap.css.map
	css/bootstrap.min.css
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	js/docs.min.js
	js/jquery.min.js