initial commit
merge confilcts and update gitignore
merge confilcts