Initial commit
merged gitignore