loll
Merge branch 'master' of https://github.com/goriintus/controlgastos2

Conflicts:
	css/index.css
	index.html
	js/index.js