fixed .gitignore
Merge branch 'dev' of github.com:Melecio/SistemasInformacion2013 into dev