initial commit
merges gitignore