adding gitignore
updated gitignore
Updated files
Merge pull request #1 from svaldivia/sebastianDev

Merging files