initial commit
git ignore
merge