added readme
added gitignore
merge
merge?