initial commit
fixed conflict in gitignore