que va comitear
nada
gitignore
Merge branch 'master' of github.com:eadsimone/klimaire
Merge branch 'master' of github.com:eadsimone/klimaire
add database and chages