Update .gitignore and main file
merge .gitignore