Updated main file, added files to gitignore