Updating gitignore
Merge branch 'master' of https://github.com/omedinad/chs
Keeping obj folder