initial commit
updated gitignore
merge resolved