first commit
merged gitignore
merged gitignore