initial commit
merged the gitignore file